empathy r2459 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Feb 13 10:26:36 2009
New Revision: 2459
URL: http://svn.gnome.org/viewvc/empathy?rev=2459&view=rev

Log:
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>

Modified:
   trunk/src/empathy-event-manager.c

Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c	(original)
+++ trunk/src/empathy-event-manager.c	Fri Feb 13 10:26:36 2009
@@ -789,7 +789,7 @@
 
           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 */