fix for QWS_DISPLAY not being set

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
@@ -417,5 +417,10 @@ void ScreenshotControl::performGrab()
                                 bool ok = false;
 
-                                if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
+                                QString displayEnv = getenv("QWS_DISPLAY");
+                                qDebug(displayEnv);
+
+                                if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
+
+                                                if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
                                                 ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
                                                 ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
@@ -429,6 +434,4 @@ void ScreenshotControl::performGrab()
 
                                                                                 QPixmap pix;
-                                                                                QString displayEnv = getenv("QWS_DISPLAY");
-                                                                                qDebug(displayEnv);
 
                                                                                 QString SCAP_model="";
@@ -457,6 +460,6 @@ void ScreenshotControl::performGrab()
                                                                                                 const char *ascii = header.latin1( );
                                                                                                 uint ascii_len = ::strlen( ascii );
-                                                                                                ::write ( sock, ascii, ascii_len );
-                                                                                                ::write ( sock, img.bits(), img.numBytes() );
+        //                                                                                      ::write ( sock, ascii, ascii_len );
+        //                                                                                      ::write ( sock, img.bits(), img.numBytes() );
 
                                                                                                 ok = true;
@@ -466,10 +469,14 @@ void ScreenshotControl::performGrab()
                                                 }
                                 }
-                                if ( ok )
+                                if ( ok ) {
                                                 QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
-                                else
+                                } else {
                                                 QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
+                                }
+                } else {
+                                QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
+                        }
                 }
-
+                                
 }