#4694 HIGH Update.: Gabble: we never believe buddies to be in more than one activity

[Zarro Boogs per Child]

#4694: Gabble: we never believe buddies to be in more than one activity
-------------------------------+--------------------------------------------
  Reporter:  smcv              |       Owner:  ApprovalForUpdate
      Type:  defect            |      Status:  new              
  Priority:  high              |   Milestone:  Update.1         
 Component:  telepathy-gabble  |     Version:                   
Resolution:                    |    Keywords:  review+          
  Verified:  0                 |  
-------------------------------+--------------------------------------------
Changes (by smcv):

 * cc: smcv (added)
  * keywords:  => review+
  * owner:  smcv => ApprovalForUpdate


Comment:

 Proposed patch, which has been reviewed upstream:

 {{{
 diff -rN -u -p old-tmpZVfVG1/src/conn-olpc.c new-tmpZVfVG1/src/conn-olpc.c
 --- old-tmpZVfVG1/src/conn-olpc.c       2007-11-06 17:30:57.617537752
 +0000
 +++ new-tmpZVfVG1/src/conn-olpc.c       2007-11-06 17:30:57.797551132
 +0000
 @@ -1125,11 +1125,16 @@ add_activity_info_in_set (GabbleConnecti
    if (activities_set == NULL)
      {
        activities_set = tp_handle_set_new (room_repo);
 -      tp_handle_set_add (activities_set, room_handle);
        g_hash_table_insert (table, GUINT_TO_POINTER (from_handle),
            activities_set);
      }

 +  /* add_activity_info_in_set isn't meant to be called if the
 +   * activity already existed */
 +  g_assert (!tp_handle_set_is_member (activities_set, room_handle));
 +
 +  tp_handle_set_add (activities_set, room_handle);
 +
    return info;
  }
 }}}

-- 
Ticket URL: <http://dev.laptop.org/ticket/4694#comment:1>
One Laptop Per Child <http://dev.laptop.org>
OLPC bug tracking system