aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <gdesmott@gnome.org>2009-02-13 18:26:36 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-13 18:26:36 +0800
commit8e588250beb9f8ba54d18c48f608ac1d1f7cdd91 (patch)
tree453d6f8cc8cb7ca86863a7ec7819e0e3f4b69ccb
parentc2db0041ca88cb86a1b2e208cf5d95c22e52f4ab (diff)
downloadgsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.tar
gsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.tar.gz
gsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.tar.bz2
gsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.tar.lz
gsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.tar.xz
gsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.tar.zst
gsoc2013-empathy-8e588250beb9f8ba54d18c48f608ac1d1f7cdd91.zip
event_manager_approve_channel_cb: we are invited if the self handle is not 0 AND we are in LP
From: Guillaume Desmottes <gdesmott@gnome.org> svn path=/trunk/; revision=2459
-rw-r--r--src/empathy-event-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 525222b83..f2bf611da 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -789,7 +789,7 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher,
self_handle = tp_channel_group_get_self_handle (channel);
- if (self_handle != 0 || tp_channel_group_get_local_pending_info (
+ if (self_handle != 0 && tp_channel_group_get_local_pending_info (
channel, self_handle, &inviter, NULL, NULL))
{
/* We are invited to a room */