Mercurial > pidgin
changeset 19114:6de2e9ba0930
merge of '2970edca111b3535ae0703e3c866ad1c3b87df94'
and 'a2b508e8680ac3f20965226a5dd83f7e2a3b15bb'
| author | Eric Polino <aluink@pidgin.im> |
|---|---|
| date | Sun, 24 Jun 2007 02:56:09 +0000 |
| parents | 7f26e5b98b15 (diff) 83b858ee2804 (current diff) |
| children | 4c26b23e7859 |
| files | finch/gntprefs.c libpurple/protocols/qq/group_misc.c libpurple/protocols/qq/group_misc.h |
| diffstat | 1 files changed, 0 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntprefs.c Sat Jun 23 02:44:28 2007 +0000 +++ b/finch/gntprefs.c Sun Jun 24 02:56:09 2007 +0000 @@ -167,25 +167,6 @@ return field; } -static GList * -get_sound_methods() -{ - GList *list = NULL; - list = g_list_append(list,(char *)_("Console Beep")); - list = g_list_append(list,"beep"); - list = g_list_append(list,(char *)_("Automatic")); - list = g_list_append(list,"automatic"); - list = g_list_append(list,(char *)_("ESD")); - list = g_list_append(list,"esd"); - list = g_list_append(list,(char *)_("ALSA")); - list = g_list_append(list,"alsa"); - list = g_list_append(list,(char *)_("Command")); - list = g_list_append(list,"custome"); - list = g_list_append(list,(char *)_("No Sound")); - list = g_list_append(list,"none"); - return list; -} - static Prefs blist[] = { {PURPLE_PREF_BOOLEAN, "/finch/blist/idletime", N_("Show Idle Time"), NULL}, @@ -219,14 +200,6 @@ {PURPLE_PREF_NONE, NULL, NULL, NULL}, }; -static Prefs sound[] = -{ - {PURPLE_PREF_STRING, FINCH_PREFS_ROOT "/sound/method", "Method", get_sound_methods}, - {PURPLE_PREF_BOOLEAN, FINCH_PREFS_ROOT "/sound/mute", "Mute the Sound", NULL}, - {PURPLE_PREF_NONE, NULL, NULL, NULL}, -}; - - static void free_strings() { @@ -269,7 +242,6 @@ add_pref_group(fields, _("Conversations"), convs); add_pref_group(fields, _("Logging"), logging); add_pref_group(fields, _("Idle"), idle); - add_pref_group(fields, _("Sound"),sound); purple_request_fields(NULL, _("Preferences"), NULL, NULL, fields, _("Save"), G_CALLBACK(save_cb), _("Cancel"), free_strings,