empathy r2721 - branches/gnome-2-26/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Mar 20 14:11:31 2009
New Revision: 2721
URL: http://svn.gnome.org/viewvc/empathy?rev=2721&view=rev

Log:
Do not reconnect chats if there is no ID. That could probably happen for MSN-like
MUCs. Fixes bug #571745

From: Xavier Claessens <xclaesse gmail com>

Modified:
   branches/gnome-2-26/libempathy-gtk/empathy-chat.c

Modified: branches/gnome-2-26/libempathy-gtk/empathy-chat.c
==============================================================================
--- branches/gnome-2-26/libempathy-gtk/empathy-chat.c	(original)
+++ branches/gnome-2-26/libempathy-gtk/empathy-chat.c	Fri Mar 20 14:11:31 2009
@@ -179,7 +179,8 @@
 
 	if (current == TP_CONNECTION_STATUS_CONNECTED && !priv->tp_chat &&
 	    empathy_account_equal (account, priv->account) &&
-	    priv->handle_type != TP_HANDLE_TYPE_NONE) {
+	    priv->handle_type != TP_HANDLE_TYPE_NONE &&
+	    !EMP_IS_EMPTY (priv->id)) {
 		
 		DEBUG ("Account reconnected, request a new Text channel");