summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index f024f47..99effa5 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -418,3 +418,8 @@ void ScreenshotControl::performGrab()
418 418
419 if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { 419 QString displayEnv = getenv("QWS_DISPLAY");
420 qDebug(displayEnv);
421
422 if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
423
424 if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
420 ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); 425 ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
@@ -430,4 +435,2 @@ void ScreenshotControl::performGrab()
430 QPixmap pix; 435 QPixmap pix;
431 QString displayEnv = getenv("QWS_DISPLAY");
432 qDebug(displayEnv);
433 436
@@ -458,4 +461,4 @@ void ScreenshotControl::performGrab()
458 uint ascii_len = ::strlen( ascii ); 461 uint ascii_len = ::strlen( ascii );
459 ::write ( sock, ascii, ascii_len ); 462 // ::write ( sock, ascii, ascii_len );
460 ::write ( sock, img.bits(), img.numBytes() ); 463 // ::write ( sock, img.bits(), img.numBytes() );
461 464
@@ -467,8 +470,12 @@ void ScreenshotControl::performGrab()
467 } 470 }
468 if ( ok ) 471 if ( ok ) {
469 QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname )); 472 QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
470 else 473 } else {
471 QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname )); 474 QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
475 }
476 } else {
477 QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
478 }
472 } 479 }
473 480
474} 481}