[Telepathy-commits] [telepathy-gabble/master] conn-olpc: fix 2 references issues: add_activity_info_in_set doesn't return a new ref and we always have to ref the activity when inserting to olpc_current_act

[Guillaume Desmottes]

---
 src/conn-olpc.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index b6b31c9..8942002 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -1350,6 +1350,7 @@ add_activity_info_in_set (GabbleConnection *conn,
    * activity already existed */
   g_assert (!tp_handle_set_is_member (activities_set, room_handle));
 
+  /* the set owns the ref of the newly created activity */
   tp_handle_set_add (activities_set, room_handle);
 
   return activity;
@@ -1368,7 +1369,6 @@ extract_current_activity (GabbleConnection *conn,
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
       (TpBaseConnection *) conn, TP_HANDLE_TYPE_CONTACT);
   TpHandle room_handle, contact_handle;
-  gboolean created = FALSE;
 
   if (node == NULL)
     return NULL;
@@ -1410,7 +1410,6 @@ extract_current_activity (GabbleConnection *conn,
       activity = add_activity_info_in_set (conn, room_handle, contact,
           conn->olpc_pep_activities);
       g_object_set (activity, "id", id, NULL);
-      created = TRUE;
     }
 
   tp_handle_unref (room_repo, room_handle);
@@ -1419,10 +1418,7 @@ extract_current_activity (GabbleConnection *conn,
   if (activity != NULL)
     {
       g_hash_table_insert (conn->olpc_current_act,
-          GUINT_TO_POINTER (contact_handle), activity);
-
-      if (!created)
-        g_object_ref (activity);
+          GUINT_TO_POINTER (contact_handle), g_object_ref (activity));
     }
   else
     {
-- 
1.5.6.5