]> git.0d.be Git - empathy.git/commitdiff
event_manager_approve_channel_cb: we are invited if the self handle is not 0 AND...
authorGuillaume Desmottes <gdesmott@gnome.org>
Fri, 13 Feb 2009 10:26:36 +0000 (10:26 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Fri, 13 Feb 2009 10:26:36 +0000 (10:26 +0000)
From: Guillaume Desmottes <gdesmott@gnome.org>

svn path=/trunk/; revision=2459

src/empathy-event-manager.c

index 525222b83206e5bd4fcbb0d2af5be20bc89611ce..f2bf611da03b6186da3fa7139d2441ad12e8caa8 100644 (file)
@@ -789,7 +789,7 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher,
 
           self_handle = tp_channel_group_get_self_handle (channel);
 
 
           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 */
                 channel, self_handle, &inviter, NULL, NULL))
             {
               /* We are invited to a room */