[Gaim-commits] SF.net SVN: gaim: [16720] branches/v2_0_0/src/protocols/jabber/buddy.c

[<the...@us...>]

Revision: 16720
Author:   thekingant
Date:     2006-08-12 04:16:53 -0700 (Sat, 12 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16720&view=rev

Log Message:
-----------
Backport SVN revision #16719 from HEAD to v2_0_0
Original commit message:

Get rid of two assertion failures and an accidentally double colon. I found
all three of these when getting the jabber info of quser.alpha.qunu.com while
trying to figure out http://trac.adiumx.com/ticket/4686

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16719&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/jabber/buddy.c
Modified: branches/v2_0_0/src/protocols/jabber/buddy.c
===================================================================
--- branches/v2_0_0/src/protocols/jabber/buddy.c	2006-08-12 11:15:23 UTC (rev 16719)
+++ branches/v2_0_0/src/protocols/jabber/buddy.c	2006-08-12 11:16:53 UTC (rev 16720)
@@ -674,7 +674,7 @@
 			}
 			if(jbr->client.name) {
 				g_string_append_printf(info_text, "<b>%s:</b> %s %s<br/>",
-						_("Client:"), jbr->client.name,
+						_("Client"), jbr->client.name,
 						jbr->client.version ? jbr->client.version : "");
 				if(jbr->client.os) {
 					g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
@@ -688,7 +688,8 @@
 
 	g_free(resource_name);
 
-	info_text = g_string_append(info_text, jbi->vcard_text);
+	if (jbi->vcard_text != NULL)
+		info_text = g_string_append(info_text, jbi->vcard_text);
 
 	gaim_notify_userinfo(jbi->js->gc, jbi->jid, info_text->str, NULL, NULL);
 
@@ -699,7 +700,9 @@
 
 	g_string_free(info_text, TRUE);
 
-	gaim_timeout_remove(jbi->timeout_handle);
+	if (jbi->timeout_handle > 0)
+		gaim_timeout_remove(jbi->timeout_handle);
+
 	g_free(jbi->jid);
 	g_hash_table_destroy(jbi->resources);
 	g_free(jbi->vcard_text);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.