Mercurial > pidgin.yaz
changeset 8945:6d7b403b11bb
[gaim-migrate @ 9717]
Eradicate Show numbers in groups.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 16 May 2004 05:52:00 +0000 |
| parents | f041cc8d86cf |
| children | 80944edf8d80 |
| files | src/gaimrc.c src/gtkblist.c src/gtkprefs.c |
| diffstat | 3 files changed, 4 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gaimrc.c Sun May 16 05:25:37 2004 +0000 +++ b/src/gaimrc.c Sun May 16 05:52:00 2004 +0000 @@ -907,8 +907,6 @@ display_options = atoi(p->value[0]); gaim_prefs_set_bool("/gaim/gtk/conversations/show_timestamps", display_options & OPT_DISP_SHOW_TIME); - gaim_prefs_set_bool("/gaim/gtk/blist/show_group_count", - display_options & OPT_DISP_SHOW_GRPNUM); gaim_prefs_set_bool("/gaim/gtk/blist/show_idle_time", display_options & OPT_DISP_SHOW_IDLETIME); gaim_prefs_set_int("/gaim/gtk/blist/button_style", @@ -956,8 +954,6 @@ logging_options & OPT_LOG_CHATS); } else if (!strcmp(p->option, "blist_options")) { blist_options = atoi(p->value[0]); - gaim_prefs_set_bool("/gaim/gtk/blist/show_group_count", - blist_options & OPT_BLIST_SHOW_GRPNUM); gaim_prefs_set_bool("/gaim/gtk/blist/show_idle_time", blist_options & OPT_BLIST_SHOW_IDLETIME); gaim_prefs_set_bool("/gaim/gtk/blist/show_empty_groups",
--- a/src/gtkblist.c Sun May 16 05:25:37 2004 +0000 +++ b/src/gtkblist.c Sun May 16 05:52:00 2004 +0000 @@ -3215,10 +3215,6 @@ _prefs_change_redo_list, NULL))); blist_prefs_callbacks = g_slist_prepend(blist_prefs_callbacks, GINT_TO_POINTER( - gaim_prefs_connect_callback("/gaim/gtk/blist/show_group_count", - _prefs_change_redo_list, NULL))); - blist_prefs_callbacks = g_slist_prepend(blist_prefs_callbacks, - GINT_TO_POINTER( gaim_prefs_connect_callback("/gaim/gtk/blist/show_offline_buddies", _prefs_change_redo_list, NULL))); @@ -3493,13 +3489,9 @@ return; esc = g_markup_escape_text(group->name, -1); - if(gaim_prefs_get_bool("/gaim/gtk/blist/show_group_count")) { - mark = g_strdup_printf("<span weight='bold'>%s</span> (%d/%d)", - esc, gaim_blist_get_group_online_count(group), - gaim_blist_get_group_size(group, FALSE)); - } else { - mark = g_strdup_printf("<span weight='bold'>%s</span>", esc); - } + mark = g_strdup_printf("<span weight='bold'>%s</span> (%d/%d)", + esc, gaim_blist_get_group_online_count(group), + gaim_blist_get_group_size(group, FALSE)); g_free(esc); gtk_tree_store_set(gtkblist->treemodel, &iter, @@ -4477,7 +4469,6 @@ gaim_prefs_add_bool("/gaim/gtk/blist/raise_on_events", FALSE); gaim_prefs_add_bool("/gaim/gtk/blist/show_buddy_icons", TRUE); gaim_prefs_add_bool("/gaim/gtk/blist/show_empty_groups", FALSE); - gaim_prefs_add_bool("/gaim/gtk/blist/show_group_count", TRUE); gaim_prefs_add_bool("/gaim/gtk/blist/show_idle_time", TRUE); gaim_prefs_add_bool("/gaim/gtk/blist/show_offline_buddies", FALSE); gaim_prefs_add_bool("/gaim/gtk/blist/show_warning_level", TRUE);
--- a/src/gtkprefs.c Sun May 16 05:25:37 2004 +0000 +++ b/src/gtkprefs.c Sun May 16 05:52:00 2004 +0000 @@ -868,12 +868,6 @@ gaim_gtk_prefs_checkbox(_("_Raise window on events"), "/gaim/gtk/blist/raise_on_events", vbox); -#if 0 /* PREFSLASH04 */ - vbox = gaim_gtk_make_frame (ret, _("Group Display")); - gaim_gtk_prefs_checkbox(_("Show _numbers in groups"), - "/gaim/gtk/blist/show_group_count", vbox); -#endif /* PREFSLASH04 */ - vbox = gaim_gtk_make_frame (ret, _("Buddy Display")); gaim_gtk_prefs_checkbox(_("Show buddy _icons"), "/gaim/gtk/blist/show_buddy_icons", vbox); @@ -2941,6 +2935,7 @@ "/gaim/gtk/sound/signon"); /* Remove some no-longer-used prefs */ + gaim_prefs_remove("/gaim/gtk/blist/show_group_count"); gaim_prefs_remove("/gaim/gtk/conversations/ignore_colors"); gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts"); gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes");