[empathy/gnome-2-30] dispatcher_channel_invalidated_cb: always remove invalidated chan from the list

[Guillaume Desmottes <gdesmott src gnome org>]

commit ec8d13b2e7acaf1f3d4e4646bf17bf0f22edcbef
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jul 6 11:23:46 2010 +0200

    dispatcher_channel_invalidated_cb: always remove invalidated chan from the list
    
    It doesn't hurt to always try to remove it and prevent us of keeping an
    invalidated or disposed object around if something weird happens.

 libempathy/empathy-dispatcher.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index f616a99..a29f26f 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -412,6 +412,8 @@ dispatcher_channel_invalidated_cb (TpProxy *proxy,
 
   connection = tp_channel_borrow_connection (TP_CHANNEL (proxy));
 
+  priv->channels = g_list_remove (priv->channels, proxy);
+
   cd = g_hash_table_lookup (priv->connections, connection);
   /* Connection itself invalidated? */
   if (cd == NULL)
@@ -423,8 +425,6 @@ dispatcher_channel_invalidated_cb (TpProxy *proxy,
 
   g_hash_table_remove (cd->dispatched_channels, object_path);
   g_hash_table_remove (cd->dispatching_channels, object_path);
-
-  priv->channels = g_list_remove (priv->channels, proxy);
 }
 
 static void