author | mickeyl <mickeyl> | 2003-10-27 19:06:54 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-27 19:06:54 (UTC) |
commit | f0a15a9866f9eddfe10596e63a1e6300b92b9e3f (patch) (unidiff) | |
tree | 8e2829bdd6ba17db418fa5ef19b3e7a06f4003e2 /noncore/comm/keypebble/krfbdecoder.cpp | |
parent | df9d9d818c9667ba8e614e5c09f0e121e9225dfd (diff) | |
download | opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.zip opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.tar.gz opie-f0a15a9866f9eddfe10596e63a1e6300b92b9e3f.tar.bz2 |
merge noncore/comm/*
Diffstat (limited to 'noncore/comm/keypebble/krfbdecoder.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/comm/keypebble/krfbdecoder.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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 | |||
@@ -333,9 +333,9 @@ void KRFBDecoder::sendAllowedEncodings() | |||
333 | static CARD8 padding[1]; | 333 | static CARD8 padding[1]; |
334 | con->write( &SetEncodingsId, 1 ); | 334 | con->write( &SetEncodingsId, 1 ); |
335 | con->write( padding, 1 ); | 335 | con->write( padding, 1 ); |
336 | 336 | ||
337 | static CARD16 noEncodings = con->options()->encodings(); | 337 | CARD16 noEncodings = con->options()->encodings(); |
338 | noEncodings = Swap16IfLE( noEncodings ); | 338 | noEncodings = Swap16IfLE( noEncodings ); |
339 | con->write( &noEncodings, 2 ); | 339 | con->write( &noEncodings, 2 ); |
340 | 340 | ||
341 | if ( con->options()->corre ) | 341 | if ( con->options()->corre ) |
@@ -558,10 +558,13 @@ void KRFBDecoder::gotRawRectChunk() | |||
558 | currentState = AwaitingRectHeader; | 558 | currentState = AwaitingRectHeader; |
559 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); | 559 | connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) ); |
560 | con->waitForData( RectHeaderLength ); | 560 | con->waitForData( RectHeaderLength ); |
561 | } | 561 | } |
562 | else | 562 | else { |
563 | // we are now ready for the next update - no need to wait for the timer | ||
563 | currentState = Idle; | 564 | currentState = Idle; |
565 | sendUpdateRequest (1); | ||
566 | } | ||
564 | } | 567 | } |
565 | } | 568 | } |
566 | 569 | ||
567 | // | 570 | // |