diff options
| author | David Yip <yipdw@alumni.rose-hulman.edu> | 2006-02-10 19:13:32 +0000 |
|---|---|---|
| committer | dwyip <dwyip@users.sourceforge.net> | 2006-02-10 19:13:32 +0000 |
| commit | 24530f311ba7cea8cb9996ed1f6cddaaa2cfe36b (patch) | |
| tree | e93e737e81f5a081e821855827e39b4873881c9b /src/jabber_whiteboard/message-contexts.cpp | |
| parent | rename so that this option will not be mistaken for generalized DXF output (diff) | |
| download | inkscape-24530f311ba7cea8cb9996ed1f6cddaaa2cfe36b.tar.gz inkscape-24530f311ba7cea8cb9996ed1f6cddaaa2cfe36b.zip | |
Fix for bug #1352522 (Inkboard: problem when invited person invites you back). I'm not marking it as CLOSED because there's still some testing left to do, but I
think this should nail it.
(bzr r113)
Diffstat (limited to 'src/jabber_whiteboard/message-contexts.cpp')
| -rw-r--r-- | src/jabber_whiteboard/message-contexts.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/jabber_whiteboard/message-contexts.cpp b/src/jabber_whiteboard/message-contexts.cpp index 1b5ea12fd..70983bad0 100644 --- a/src/jabber_whiteboard/message-contexts.cpp +++ b/src/jabber_whiteboard/message-contexts.cpp @@ -68,6 +68,11 @@ initialize_received_message_contexts(MessageContextMap& mcm) // Message: CONNECT_REQUEST_USER std::bitset< NUM_FLAGS > m5; m5.set(LOGGED_IN); + + // We should still _accept_ CONNECT_REQUEST_USER messages even if we're already + // waiting for a response. It is up to the higher-level handler (i.e. the connection + // request handler) to properly handle it. + m5.set(WAITING_FOR_INVITE_RESPONSE); mcm[CONNECT_REQUEST_USER] = m5; // Message: CONNECT_REQUEST_RESPONSE_USER |