ref group when async calls are in flight to avoid destroying the object

[empathy.git] / libempathy / empathy-tp-group.c

diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index dbc2d228e07a6f19362ca8b12746fc75476c7c48..f6f8004cce00a988246ad13fab83e351371a625f 100644 (file)
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -358,6 +358,7 @@ tp_group_get_members_cb (DBusGProxy *proxy,
        if (error) {
                empathy_debug (DEBUG_DOMAIN, "Failed to get members: %s",
                               error->message);
+               g_object_unref (group);
                return;
        }
 
@@ -372,6 +373,7 @@ tp_group_get_members_cb (DBusGProxy *proxy,
                                     group);
 
        g_array_free (handles, TRUE);
+       g_object_unref (group);
 }
 
 static void
@@ -388,6 +390,7 @@ tp_group_get_local_pending_cb (DBusGProxy *proxy,
        if (error) {
                empathy_debug (DEBUG_DOMAIN, "Failed to get local pendings: %s",
                               error->message);
+               g_object_unref (group);
                return;
        }
 
@@ -420,6 +423,7 @@ tp_group_get_local_pending_cb (DBusGProxy *proxy,
        }
        g_ptr_array_free (array, TRUE);
        g_array_free (handles, TRUE);
+       g_object_unref (group);
 }
 
 static void
@@ -434,6 +438,7 @@ tp_group_get_remote_pending_cb (DBusGProxy *proxy,
        if (error) {
                empathy_debug (DEBUG_DOMAIN, "Failed to get remote pendings: %s",
                               error->message);
+               g_object_unref (group);
                return;
        }
 
@@ -448,6 +453,7 @@ tp_group_get_remote_pending_cb (DBusGProxy *proxy,
                                     group);
 
        g_array_free (handles, TRUE);
+       g_object_unref (group);
 }
 
 static void
@@ -455,6 +461,8 @@ tp_group_finalize (GObject *object)
 {
        EmpathyTpGroupPriv *priv = GET_PRIV (object);
 
+       empathy_debug (DEBUG_DOMAIN, "finalize: %p");
+
        tp_group_disconnect (EMPATHY_TP_GROUP (object));
 
        if (priv->tp_chan) {
@@ -590,13 +598,13 @@ empathy_tp_group_new (McAccount *account,
 
        tp_chan_iface_group_get_members_async (priv->group_iface,
                                               tp_group_get_members_cb,
-                                              group);
+                                              g_object_ref (group));
        tp_chan_iface_group_get_local_pending_members_with_info_async (priv->group_iface,
                                                                       tp_group_get_local_pending_cb,
-                                                                      group);
+                                                                      g_object_ref (group));
        tp_chan_iface_group_get_remote_pending_members_async (priv->group_iface,
                                                              tp_group_get_remote_pending_cb,
-                                                             group);
+                                                             g_object_ref (group));
 
        return group;
 }