summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Yip <yipdw@alumni.rose-hulman.edu>2006-04-02 01:10:00 +0000
committerdwyip <dwyip@users.sourceforge.net>2006-04-02 01:10:00 +0000
commit7c23485ab0610243e42e5cec7f220690622dcf5d (patch)
tree5520a8882c640c20e52596924a582a66b076f1ba /src
parentadded fix from Dale Harvey to expand incomplete JIDs specified in user (diff)
downloadinkscape-7c23485ab0610243e42e5cec7f220690622dcf5d.tar.gz
inkscape-7c23485ab0610243e42e5cec7f220690622dcf5d.zip
from Dale Harvey and Aaron Spike: fixes to overly-general "mouse down"
detection logic in connect request receive code (bzr r398)
Diffstat (limited to 'src')
-rw-r--r--src/jabber_whiteboard/connection-establishment.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jabber_whiteboard/connection-establishment.cpp b/src/jabber_whiteboard/connection-establishment.cpp
index eba75d9a4..5cc9e053d 100644
--- a/src/jabber_whiteboard/connection-establishment.cpp
+++ b/src/jabber_whiteboard/connection-establishment.cpp
@@ -115,7 +115,7 @@ SessionManager::receiveConnectRequest(gchar const* requesterJID)
Gdk::ModifierType mt;
Gdk::Display::get_default()->get_pointer(x, y, mt);
- if (mt) {
+ if (mt & GDK_BUTTON1_MASK) {
// Attach a polling timeout
this->_notify_incoming_request = Glib::signal_timeout().connect(sigc::bind< 0 >(sigc::mem_fun(*this, &SessionManager::_pollReceiveConnectRequest), requesterJID), 50);
return;
@@ -320,7 +320,7 @@ SessionManager::_pollReceiveConnectRequest(Glib::ustring const recipientJID)
Gdk::ModifierType mt;
Gdk::Display::get_default()->get_pointer(x, y, mt);
- if (mt) {
+ if (mt & GDK_BUTTON1_MASK) {
return true;
} else {
this->receiveConnectRequest(recipientJID.c_str());