merge noncore/comm/*

5 files changed, 15 insertions, 16 deletions

diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 7af60f9..b3cb172 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,6 +1,4 @@
-TEMPLATE        = app
-CONFIG          += qt warn_on release
-DESTDIR         = $(OPIEDIR)/bin
+CONFIG          += qt warn_on release quick-app
 HEADERS		= d3des.h \
 		  krfbbuffer.h \
 		  krfbcanvas.h \
@@ -27,11 +25,13 @@ SOURCES		= d3des.c \
 		  main.cpp
 INTERFACES	= kvncconndlgbase.ui \
 						kvncbookmarkdlgbase.ui
-TARGET          = keypebble
+
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 
+TARGET		= keypebble
+
 TRANSLATIONS = ../../../i18n/de/keypebble.ts \
 	 ../../../i18n/nl/keypebble.ts \
 	 ../../../i18n/da/keypebble.ts \
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 33418ae..dc90d9c 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -334,7 +334,7 @@ void KRFBDecoder::sendAllowedEncodings()
   con->write( &SetEncodingsId, 1 );
   con->write( padding, 1 );
 
-  static CARD16 noEncodings = con->options()->encodings();
+  CARD16 noEncodings = con->options()->encodings();
   noEncodings = Swap16IfLE( noEncodings );
   con->write( &noEncodings, 2 );
 
@@ -559,8 +559,11 @@ void KRFBDecoder::gotRawRectChunk()
       connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
       con->waitForData( RectHeaderLength );
     }
-    else
+    else {
+      // we are now ready for the next update - no need to wait for the timer
       currentState = Idle;
+      sendUpdateRequest (1);
+    }
   }
 }
 
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 48a442c..c89dec5 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -56,7 +56,7 @@ static char * menu_xpm[] = {
 
 const int StatusTextId = 0;
 
-KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
+KVNC::KVNC(  QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp)
 {
     setCaption( tr("VNC Viewer") );
     fullscreen = false;
diff --git a/noncore/comm/keypebble/kvnc.h b/noncore/comm/keypebble/kvnc.h
index 51c7151..7b7cc91 100644
--- a/noncore/comm/keypebble/kvnc.h
+++ b/noncore/comm/keypebble/kvnc.h
@@ -23,7 +23,7 @@ class KVNC : public QMainWindow
 {
   Q_OBJECT
 public: 
-  KVNC( const char *name = 0 );
+  KVNC( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~KVNC(); 
 
 public slots:
@@ -34,6 +34,7 @@ public slots:
   void openConnection(void);
   void toggleFullScreen();
   void closeConnection();
+  static QString appName() { return QString::fromLatin1("keypebble"); }
 
 protected:
   void setupActions();
diff --git a/noncore/comm/keypebble/main.cpp b/noncore/comm/keypebble/main.cpp
index bc7782c..11f67fc 100644
--- a/noncore/comm/keypebble/main.cpp
+++ b/noncore/comm/keypebble/main.cpp
@@ -1,15 +1,10 @@
 
 
-#include <qurl.h>
+
 #include <qpe/qpeapplication.h>
 #include "kvnc.h"
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char **argv )
-{
-  QPEApplication app( argc, argv );
-  KVNC *view = new KVNC( "Keypebble" );
-  app.showMainWidget( view );
 
-  return app.exec();
-}
 
+OPIE_EXPORT_APP( OApplicationFactory<KVNC> )