don't try to gracefully avoid a bug if it's there; assert what can't happen, and fix the bug if and when it happenstelepathy-gabble-0.6

20080311145440-01440-9d98013f425c24723c49ea134d2673f5a858085d.gz

1 files changed, 4 insertions, 7 deletions

diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index e4904338e..c10c90576 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -284,13 +284,10 @@ _got_self_avatar_for_get_known_avatar_tokens (GObject *obj,
 
   g_signal_handler_disconnect (obj, context->signal_conn);
 
-  /* If we're disconnecting (meaning self_handle==0), don't ever
-   * bother, we'll just confuse the client with a strange handle. */
-  if (base->self_handle != 0)
-    {
-      g_hash_table_insert (context->ret, GUINT_TO_POINTER (base->self_handle),
-          g_strdup (sha1));
-    }
+  g_assert (base->self_handle != 0);
+
+  g_hash_table_insert (context->ret, GUINT_TO_POINTER (base->self_handle),
+      g_strdup (sha1));
 
   tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (
       context->invocation, context->ret);