diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-02-28 22:30:02 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-02-28 22:30:02 +0000 |
| commit | 805cac98cf9587185765151cfe70d5f56248fd25 (patch) | |
| tree | 4d2009006e12a6832f85df9b54f9d19dc7076470 | |
| parent | 73eb9ac62ba243f64a98dc36c5e32a0f736dc9a0 (diff) | |
| download | pidgin-805cac98cf9587185765151cfe70d5f56248fd25.tar.gz | |
Remove a glib assertion warning regarding the mood setting UI.
Fixed pre-selecting "none" mood. Removed some unused code, and simplified a bit
| -rw-r--r-- | pidgin/gtkblist.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c index 9e9f89380b..5ac81b55af 100644 --- a/pidgin/gtkblist.c +++ b/pidgin/gtkblist.c @@ -7847,7 +7847,6 @@ set_mood_cb(GtkWidget *widget, PurpleAccount *account) 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, PurpleAccount *account) 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++) { |