pidgin: 85ddef87: Remove a glib assertion warning regardin...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 85ddef87173c52c6c3d48fafa3cc3a5347dd040d
Ancestor: ff30fd408e0034cdac85b51ff70e7980bd37ee61
Author: malu at pidgin.im
Date: 2010-02-28T22:30:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/85ddef87173c52c6c3d48fafa3cc3a5347dd040d

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Remove a glib assertion warning regarding the mood setting UI.
Fixed pre-selecting "none" mood. Removed some unused code, and simplified a bit

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	d6255e32318fdbd82bc2caac538d104e644b9efd
+++ pidgin/gtkblist.c	e7d18e0b764c70b86ad0a08f6ff748dfc69a0087
@@ -7847,7 +7847,6 @@ set_mood_cb(GtkWidget *widget, PurpleAcc
 	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 @@ set_mood_cb(GtkWidget *widget, PurpleAcc
 	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++) {