remove EmpathyContactManager's test

[empathy.git] / libempathy-gtk / empathy-contact-list-store.c

diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 6350a0483d0138ff4550dfcaa338d939952dc282..359e6c1b60100999ae1425c97e1d3594c56c781e 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -80,6 +80,7 @@ typedef struct {
        EmpathyContactListStore *store;
        EmpathyContact          *contact;
        gboolean                remove;
+       guint                   timeout;
 } ShowActiveData;
 
 static void             contact_list_store_dispose                  (GObject                       *object);
@@ -100,10 +101,6 @@ static void             contact_list_store_members_changed_cb        (EmpathyCon
                                                                      gchar                         *message,
                                                                      gboolean                       is_member,
                                                                      EmpathyContactListStore       *store);
-static void             contact_list_store_favourites_changed_cb     (EmpathyContactList            *list_iface,
-                                                                     EmpathyContact                *contact,
-                                                                     gboolean                       is_favourite,
-                                                                     EmpathyContactListStore       *store);
 static void             contact_list_store_member_renamed_cb         (EmpathyContactList            *list_iface,
                                                                      EmpathyContact                *old_contact,
                                                                      EmpathyContact                *new_contact,
@@ -207,10 +204,6 @@ contact_list_store_iface_setup (gpointer user_data)
                          "members-changed",
                          G_CALLBACK (contact_list_store_members_changed_cb),
                          store);
-       g_signal_connect (priv->list,
-                         "favourites-changed",
-                         G_CALLBACK (contact_list_store_favourites_changed_cb),
-                         store);
        g_signal_connect (priv->list,
                          "groups-changed",
                          G_CALLBACK (contact_list_store_groups_changed_cb),
@@ -378,25 +371,24 @@ contact_list_store_dispose (GObject *object)
        g_signal_handlers_disconnect_by_func (priv->list,
                                              G_CALLBACK (contact_list_store_members_changed_cb),
                                              object);
-       g_signal_handlers_disconnect_by_func (priv->list,
-                                             G_CALLBACK (contact_list_store_favourites_changed_cb),
-                                             object);
        g_signal_handlers_disconnect_by_func (priv->list,
                                              G_CALLBACK (contact_list_store_groups_changed_cb),
                                              object);
        g_object_unref (priv->list);
 
-       if (priv->inhibit_active) {
+       if (priv->inhibit_active != 0) {
                g_source_remove (priv->inhibit_active);
+               priv->inhibit_active = 0;
        }
 
        if (priv->setup_idle_id != 0) {
                g_source_remove (priv->setup_idle_id);
+               priv->setup_idle_id = 0;
        }
 
-       g_hash_table_destroy (priv->status_icons);
-       g_hash_table_destroy (priv->empathy_contact_cache);
-       g_hash_table_destroy (priv->empathy_group_cache);
+       g_hash_table_unref (priv->status_icons);
+       g_hash_table_unref (priv->empathy_contact_cache);
+       g_hash_table_unref (priv->empathy_group_cache);
        G_OBJECT_CLASS (empathy_contact_list_store_parent_class)->dispose (object);
 }
 
@@ -936,21 +928,6 @@ contact_list_store_members_changed_cb (EmpathyContactList      *list_iface,
        }
 }
 
-static void
-contact_list_store_favourites_changed_cb (EmpathyContactList      *list_iface,
-                                         EmpathyContact          *contact,
-                                         gboolean                 is_favourite,
-                                         EmpathyContactListStore *store)
-{
-       DEBUG ("Contact %s (%d) is %s a favourite",
-               empathy_contact_get_id (contact),
-               empathy_contact_get_handle (contact),
-               is_favourite ? "now" : "no longer");
-
-       contact_list_store_remove_contact (store, contact);
-       contact_list_store_add_contact (store, contact);
-}
-
 static void
 contact_list_store_member_renamed_cb (EmpathyContactList      *list_iface,
                                      EmpathyContact          *old_contact,
@@ -1280,7 +1257,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
 
                if (do_set_active) {
                        data = contact_list_store_contact_active_new (store, contact, do_remove);
-                       g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
+                       data->timeout = g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
                                               (GSourceFunc) contact_list_store_contact_active_cb,
                                               data);
                }
@@ -1339,6 +1316,24 @@ contact_list_store_contact_set_active (EmpathyContactListStore *store,
 
 }
 
+static void
+store_contact_active_invalidated (ShowActiveData *data,
+       GObject *old_object)
+{
+       /* Remove the timeout and free the struct, since the contact or contact
+        * store has disappeared. */
+       g_source_remove (data->timeout);
+
+        if (old_object == (GObject *) data->store)
+               data->store = NULL;
+        else if (old_object == (GObject *) data->contact)
+               data->contact = NULL;
+        else
+               g_assert_not_reached ();
+
+       contact_list_store_contact_active_free (data);
+}
+
 static ShowActiveData *
 contact_list_store_contact_active_new (EmpathyContactListStore *store,
                                       EmpathyContact          *contact,
@@ -1352,9 +1347,18 @@ contact_list_store_contact_active_new (EmpathyContactListStore *store,
 
        data = g_slice_new0 (ShowActiveData);
 
-       data->store = g_object_ref (store);
-       data->contact = g_object_ref (contact);
+       /* We don't actually want to force either the IndividualStore or the
+        * Individual to stay alive, since the user could quit Empathy or disable
+        * the account before the contact_active timeout is fired. */
+       g_object_weak_ref (G_OBJECT (store),
+               (GWeakNotify) store_contact_active_invalidated, data);
+       g_object_weak_ref (G_OBJECT (contact),
+               (GWeakNotify) store_contact_active_invalidated, data);
+
+       data->store = store;
+       data->contact = contact;
        data->remove = remove_;
+       data->timeout = 0;
 
        return data;
 }
@@ -1362,8 +1366,13 @@ contact_list_store_contact_active_new (EmpathyContactListStore *store,
 static void
 contact_list_store_contact_active_free (ShowActiveData *data)
 {
-       g_object_unref (data->contact);
-       g_object_unref (data->store);
+       if (data->store != NULL)
+               g_object_weak_unref (G_OBJECT (data->store),
+                       (GWeakNotify) store_contact_active_invalidated, data);
+
+       if (data->contact != NULL)
+               g_object_weak_unref (G_OBJECT (data->contact),
+                       (GWeakNotify) store_contact_active_invalidated, data);
 
        g_slice_free (ShowActiveData, data);
 }