pidgin: 5774a9e6: Don't try to escape a NULL text. This ge...

sadrul at pidgin.im sadrul at pidgin.im
Sat May 24 19:05:42 EDT 2008


-----------------------------------------------------------------
Revision: 5774a9e66b31b8dcccca6eb3eb81521086ecd801
Ancestor: 0305c5b3f3b71c3b449591e65dd47f2dae2d3922
Author: sadrul at pidgin.im
Date: 2008-05-24T22:54:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5774a9e66b31b8dcccca6eb3eb81521086ecd801

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Don't try to escape a NULL text. This gets rid of a runtime warning.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	fcf3a62a2bc034e8dcdf0addf5097a7ea54d3537
+++ pidgin/gtkblist.c	6e277f7a27ca66e1bac4ef106044a9f28920951f
@@ -3336,7 +3336,8 @@ static char *pidgin_get_tooltip_text(Pur
 					g_list_length(purple_conv_chat_get_users(PURPLE_CONV_CHAT(conv))));
 
 			if (prpl_info && (prpl_info->options & OPT_PROTO_CHAT_TOPIC)) {
-				char *topic = g_markup_escape_text(purple_conv_chat_get_topic(PURPLE_CONV_CHAT(conv)), -1);
+				const char *chattopic = purple_conv_chat_get_topic(PURPLE_CONV_CHAT(conv));
+				char *topic = chattopic ? g_markup_escape_text(chattopic, -1) : NULL;
 				g_string_append_printf(str, _("\n<b>Topic:</b> %s"), topic ? topic : _("(no topic set)"));
 				g_free(topic);
 			}


More information about the Commits mailing list