[Telepathy-commits] [telepathy-salut/master] salut-presence-cache.c: Remove info->guys for now, it is not used and the reference count on SalutContact is wrong. However, the feature to not ask the same caps info from different contacts still need to be implemented.

Alban Crequy alban.crequy at collabora.co.uk
Thu Feb 26 11:20:12 PST 2009


---
 src/salut-presence-cache.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/src/salut-presence-cache.c b/src/salut-presence-cache.c
index c279d1f..4ab5345 100644
--- a/src/salut-presence-cache.c
+++ b/src/salut-presence-cache.c
@@ -155,9 +155,6 @@ struct _CapabilityInfo
    * the list of supported tube types (example: stream tube for daap).
    */
   GHashTable *per_channel_manager_caps;
-
-  /* SalutContact -> NULL */
-  GHashTable *guys;
 };
 
 static CapabilityInfo *
@@ -170,8 +167,6 @@ capability_info_get (SalutPresenceCache *cache, const gchar *uri)
     {
       info = g_slice_new0 (CapabilityInfo);
       info->caps_set = FALSE;
-      info->guys = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-          g_object_unref, NULL);
       g_hash_table_insert (priv->capabilities, g_strdup (uri), info);
     }
 
@@ -181,7 +176,6 @@ capability_info_get (SalutPresenceCache *cache, const gchar *uri)
 static void
 capability_info_free (CapabilityInfo *info)
 {
-  g_hash_table_destroy (info->guys);
   g_slice_free (CapabilityInfo, info);
 }
 
@@ -190,7 +184,6 @@ capability_info_recvd (SalutPresenceCache *cache, const gchar *node,
         SalutContact *contact, GHashTable *per_channel_manager_caps)
 {
   CapabilityInfo *info = capability_info_get (cache, node);
-  gpointer dummy_key, dummy_value;
 
   if (! info->caps_set)
     {
@@ -200,12 +193,6 @@ capability_info_recvd (SalutPresenceCache *cache, const gchar *node,
       info->per_channel_manager_caps = per_channel_manager_caps;
       info->caps_set = TRUE;
     }
-
-  if (!g_hash_table_lookup_extended (info->guys, contact, &dummy_key,
-        &dummy_value))
-    {
-      g_hash_table_insert (info->guys, g_object_ref (contact), NULL);
-    }
 }
 
 static void salut_presence_cache_init (SalutPresenceCache *presence_cache);
-- 
1.5.6.5




More information about the telepathy-commits mailing list