pidgin.2.5.6: c78853d0: applied changes from aa7ce93329f5ccbe746...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: c78853d0264056c6a6a998c43882bed5cb83cfb8
Ancestor: 2148612a951b799182f85ab778378f88113cdf01
Author: elb at pidgin.im
Date: 2009-04-28T20:41:37
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/c78853d0264056c6a6a998c43882bed5cb83cfb8

Modified files:
        finch/gntblist.c finch/gntnotify.c

ChangeLog: 

applied changes from aa7ce93329f5ccbe74640a92b6656ae402d8eea8
             through e54933232e44b0c259cee6eff8f9354e6b94fe5d

-------------- next part --------------
============================================================
--- finch/gntblist.c	08ff46b3e194a312827fc8f098af34641f9377f8
+++ finch/gntblist.c	34ed1218ec900bf08108f0055155f2e222a7036a
@@ -931,7 +931,7 @@ get_display_name(PurpleBlistNode *node)
 	else if (PURPLE_BLIST_NODE_IS_GROUP(node))
 		return purple_group_get_name((PurpleGroup*)node);
 
-	snprintf(text, sizeof(text) - 1, "%s %s", status, name);
+	g_snprintf(text, sizeof(text) - 1, "%s %s", status, name);
 
 	return text;
 }
@@ -2638,7 +2638,7 @@ reconstruct_grouping_menu(void)
 		char menuid[128];
 		FinchBlistManager *manager = iter->data;
 		GntMenuItem *item = gnt_menuitem_new(_(manager->name));
-		snprintf(menuid, sizeof(menuid), "grouping-%s", manager->id);
+		g_snprintf(menuid, sizeof(menuid), "grouping-%s", manager->id);
 		gnt_menuitem_set_id(GNT_MENU_ITEM(item), menuid);
 		gnt_menu_add_item(GNT_MENU(subsub), item);
 		g_object_set_data_full(G_OBJECT(item), "grouping-id", g_strdup(manager->id), g_free);
============================================================
--- finch/gntnotify.c	c9f267524c4411e19306cfaa762b5d800b94873e
+++ finch/gntnotify.c	cf3e3c94710e7d18ed575a3b2d49ea9f3281ad07
@@ -263,7 +263,7 @@ userinfo_hash(PurpleAccount *account, co
 userinfo_hash(PurpleAccount *account, const char *who)
 {
 	char key[256];
-	snprintf(key, sizeof(key), "%s - %s", purple_account_get_username(account), purple_normalize(account, who));
+	g_snprintf(key, sizeof(key), "%s - %s", purple_account_get_username(account), purple_normalize(account, who));
 	return g_utf8_strup(key, -1);
 }