summaryrefslogtreecommitdiff
authortreke <treke>2002-12-22 00:58:46 (UTC)
committer treke <treke>2002-12-22 00:58:46 (UTC)
commit17d7f11b16b650f6ee2b5c440506167ea41fbfe5 (patch) (unidiff)
treecd5924c9e374a82c1cac6433dce098f3f45f4286
parent6853d02989fc01e5a65048aca9749c20e0f5d095 (diff)
downloadopie-17d7f11b16b650f6ee2b5c440506167ea41fbfe5.zip
opie-17d7f11b16b650f6ee2b5c440506167ea41fbfe5.tar.gz
opie-17d7f11b16b650f6ee2b5c440506167ea41fbfe5.tar.bz2
1) Fixed a bug where double clicking a blank spot on the bookmark list
caused a segfault. 2) Removed support for copying from the server. Trying to setText in the clipboard would segfault everytime from within the KRFBDecoder. Doesnt seem to like being called from within a slot.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/comm/keypebble/krfbcanvas.cpp4
-rw-r--r--noncore/comm/keypebble/krfbdecoder.cpp5
-rw-r--r--noncore/comm/keypebble/kvnc.cpp3
3 files changed, 6 insertions, 6 deletions
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index 049bbd4..bc71c90 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -143,8 +143,6 @@ void KRFBCanvas::contentsMousePressEvent( QMouseEvent *e )
143 } else if ( loggedIn_ ) 143 } else if ( loggedIn_ )
144 connection_->buffer()->mouseEvent( e ); 144 connection_->buffer()->mouseEvent( e );
145 145
146 qDebug("Press");
147 qDebug(QString::number(e->type()==QEvent::MouseButtonPress));
148} 146}
149 147
150void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e ) 148void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e )
@@ -155,8 +153,6 @@ void KRFBCanvas::contentsMouseReleaseEvent( QMouseEvent *e )
155 153
156 nextRightClick=0; 154 nextRightClick=0;
157 nextDoubleClick=0; 155 nextDoubleClick=0;
158 qDebug("Release");
159 qDebug(QString::number(e->button()));
160} 156}
161 157
162void KRFBCanvas::contentsMouseMoveEvent( QMouseEvent *e ) 158void KRFBCanvas::contentsMouseMoveEvent( QMouseEvent *e )
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 94e3b79..33418ae 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -707,6 +707,7 @@ void KRFBDecoder::gotServerCutText()
707 disconnect( con, SIGNAL( gotEnoughData() ), 707 disconnect( con, SIGNAL( gotEnoughData() ),
708 this, SLOT( gotServerCutText() ) ); 708 this, SLOT( gotServerCutText() ) );
709 709
710
710 // 711 //
711 // Warning: There is a bug in the RFB protocol because there is no way to find 712 // Warning: There is a bug in the RFB protocol because there is no way to find
712 // out the codepage in use on the remote machine. This could be fixed by requiring 713 // out the codepage in use on the remote machine. This could be fixed by requiring
@@ -721,13 +722,15 @@ void KRFBDecoder::gotServerCutText()
721 con->read( cutbuf, serverCutTextLen ); 722 con->read( cutbuf, serverCutTextLen );
722 cutbuf[ serverCutTextLen ] = '\0'; 723 cutbuf[ serverCutTextLen ] = '\0';
723 724
725 /* For some reason QApplication::clipboard()->setText() segfaults when called
726 * from within keypebble's mass of signals and slots
724 qWarning( "Server cut: %s", cutbuf ); 727 qWarning( "Server cut: %s", cutbuf );
725 728
726 QString cutText( cutbuf ); // DANGER!! 729 QString cutText( cutbuf ); // DANGER!!
727 qApp->clipboard()->setText( cutText ); 730 qApp->clipboard()->setText( cutText );
731 */
728 732
729 delete cutbuf; 733 delete cutbuf;
730
731 // Now wait for the update (again) 734 // Now wait for the update (again)
732 if ( oldState == AwaitingUpdate ) { 735 if ( oldState == AwaitingUpdate ) {
733 currentState = AwaitingUpdate; 736 currentState = AwaitingUpdate;
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 5b1dc9f..48a442c 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -159,7 +159,8 @@ void KVNC::openConnection( void )
159 159
160void KVNC::openConnection( QListBoxItem * item) 160void KVNC::openConnection( QListBoxItem * item)
161{ 161{
162 openConnection(item->text()); 162 if (item)
163 openConnection(item->text());
163} 164}
164 165
165void KVNC::setupActions() 166void KVNC::setupActions()