[telepathy-gabble/master] Don't add resource when rediscoing if it's NULL

Will Thompson will.thompson at collabora.co.uk
Tue Jun 16 14:35:12 PDT 2009


---
 src/presence-cache.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/presence-cache.c b/src/presence-cache.c
index 59e157a..cbb55c7 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -840,7 +840,10 @@ redisco (GabblePresenceCache *cache,
   gchar *full_jid;
 
   waiter_jid = tp_handle_inspect (waiter->repo, waiter->handle);
-  full_jid = g_strdup_printf ("%s/%s", waiter_jid, waiter->resource);
+  if (waiter->resource != NULL)
+    full_jid = g_strdup_printf ("%s/%s", waiter_jid, waiter->resource);
+  else
+    full_jid = g_strdup (waiter_jid);
 
   gabble_disco_request (disco, GABBLE_DISCO_TYPE_INFO, full_jid,
       node, _caps_disco_cb, cache, G_OBJECT (cache), NULL);
-- 
1.5.6.5




More information about the telepathy-commits mailing list