summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-01-18 05:11:58 (UTC)
committer llornkcor <llornkcor>2004-01-18 05:11:58 (UTC)
commitf5d28a9b86f5fdf8b4512d34c34e77284756f95c (patch) (unidiff)
tree9c6bf9022095a957c16f7a31f447608612a1589e
parent933d897346745d3d51e41591c59387ef6d2bb917 (diff)
downloadopie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.zip
opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.tar.gz
opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.tar.bz2
fix for QWS_DISPLAY not being set
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
@@ -416,7 +416,12 @@ void ScreenshotControl::performGrab()
416 int sock = -1; 416 int sock = -1;
417 bool ok = false; 417 bool ok = false;
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));
421 ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); 426 ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
422 raddr. sin_family = rhost_info-> h_addrtype; 427 raddr. sin_family = rhost_info-> h_addrtype;
@@ -428,8 +433,6 @@ void ScreenshotControl::performGrab()
428 QString header; 433 QString header;
429 434
430 QPixmap pix; 435 QPixmap pix;
431 QString displayEnv = getenv("QWS_DISPLAY");
432 qDebug(displayEnv);
433 436
434 QString SCAP_model=""; 437 QString SCAP_model="";
435#warning FIXME: model string should be filled with actual device model 438#warning FIXME: model string should be filled with actual device model
@@ -456,8 +459,8 @@ void ScreenshotControl::performGrab()
456 if ( !pix.isNull() ) { 459 if ( !pix.isNull() ) {
457 const char *ascii = header.latin1( ); 460 const char *ascii = header.latin1( );
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
462 ok = true; 465 ok = true;
463 } 466 }
@@ -465,12 +468,16 @@ void ScreenshotControl::performGrab()
465 ::close ( sock ); 468 ::close ( sock );
466 } 469 }
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}
475 482
476 483