Mercurial > pidgin.yaz

changeset 29902:27a94015e239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove a glib assertion warning regarding the mood setting UI. Fixed pre-selecting "none" mood. Removed some unused code, and simplified a bit
author Marcus Lundblad <ml@update.uu.se>
date Sun, 28 Feb 2010 22:30:02 +0000
parents 7adebf6acc50
children c9a5b4ddff87 6bcf405d5c63
files pidgin/gtkblist.c
diffstat 1 files changed, 1 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Sun Feb 28 19:34:49 2010 +0000
+++ b/pidgin/gtkblist.c	Sun Feb 28 22:30:02 2010 +0000
@@ -7847,7 +7847,6 @@
 	PurpleRequestFields *fields;
 	PurpleRequestFieldGroup *g;
 	PurpleRequestField *f;
-	char* na_fn;
 	PurpleConnection *gc = purple_account_get_connection(account);
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleMood *mood;
@@ -7861,19 +7860,10 @@
 	g = purple_request_field_group_new(NULL);
 	f = purple_request_field_list_new("mood", _("Please select your mood from the list"));
 
-	na_fn = g_build_filename("pixmaps", "pidgin", "emblems", "16", "not-authorized.png", NULL);
-
-	purple_request_field_list_add_icon(f, _("None"), na_fn, NULL);
+	purple_request_field_list_add(f, _("None"), "");
 	if (current_mood == NULL)
 		purple_request_field_list_add_selected(f, _("None"));
 
-	g_free(na_fn);
-
-	/* first item is an empty one for unsetting the mood */
-	purple_request_field_list_add(f, "", "");
-	if (purple_strequal(current_mood, ""))
-		purple_request_field_list_add_selected(f, "");
-	
 	/* TODO: rlaager wants this sorted. */
 	for (mood = prpl_info->get_moods(account);
 	     mood->mood != NULL ; mood++) {