Mercurial > pidgin.yaz

comparison pidgin/gtkprefs.c @ 28934:3f1d39bac4cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the default themes' names consistent with the default smiley theme.
author John Bailey <rekkanoryo@rekkanoryo.org>
date Wed, 11 Nov 2009 19:48:59 +0000
parents aae013ae7e1e
children 7a4832d1f3dd
comparison
equal deleted inserted replaced
28933:aae013ae7e1e 28934:3f1d39bac4cd
490 490
491 print_custom = customized && name && g_str_equal(current_theme, name); 491 print_custom = customized && name && g_str_equal(current_theme, name);
492 492
493 if (!name || *name == '\0') { 493 if (!name || *name == '\0') {
494 g_free(name); 494 g_free(name);
495 name = g_strdup(_("(Default)")); 495 name = g_strdup(_("Default"));
496 author = _("Penguin Pimps"); 496 author = _("Penguin Pimps");
497 description = _("The default Pidgin sound theme"); 497 description = _("The default Pidgin sound theme");
498 } else { 498 } else {
499 theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(name, "sound")); 499 theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(name, "sound"));
500 author = purple_theme_get_author(PURPLE_THEME(theme)); 500 author = purple_theme_get_author(PURPLE_THEME(theme));
611 gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, "", -1); 611 gtk_list_store_set(prefs_sound_themes, &iter, 0, pixbuf, 2, "", -1);
612 612
613 /* blist themes */ 613 /* blist themes */
614 gtk_list_store_clear(prefs_blist_themes); 614 gtk_list_store_clear(prefs_blist_themes);
615 gtk_list_store_append(prefs_blist_themes, &iter); 615 gtk_list_store_append(prefs_blist_themes, &iter);
616 tmp = get_theme_markup(_("(Default)"), FALSE, _("Penguin Pimps"), 616 tmp = get_theme_markup(_("Default"), FALSE, _("Penguin Pimps"),
617 _("The default Pidgin buddy list theme")); 617 _("The default Pidgin buddy list theme"));
618 gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1); 618 gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1);
619 g_free(tmp); 619 g_free(tmp);
620 620
621 /* status icon themes */ 621 /* status icon themes */
622 gtk_list_store_clear(prefs_status_icon_themes); 622 gtk_list_store_clear(prefs_status_icon_themes);
623 gtk_list_store_append(prefs_status_icon_themes, &iter); 623 gtk_list_store_append(prefs_status_icon_themes, &iter);
624 tmp = get_theme_markup(_("(Default)"), FALSE, _("Penguin Pimps"), 624 tmp = get_theme_markup(_("Default"), FALSE, _("Penguin Pimps"),
625 _("The default Pidgin status icon theme")); 625 _("The default Pidgin status icon theme"));
626 gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1); 626 gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, tmp, 2, "", -1);
627 g_free(tmp); 627 g_free(tmp);
628 if (pixbuf) 628 if (pixbuf)
629 g_object_unref(G_OBJECT(pixbuf)); 629 g_object_unref(G_OBJECT(pixbuf));
1167 {"STRING", 0, 2} 1167 {"STRING", 0, 2}
1168 }; 1168 };
1169 GtkWidget *themesel_hbox; 1169 GtkWidget *themesel_hbox;
1170 GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1170 GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1171 GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1171 GtkSizeGroup *combo_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1172 GtkSizeGroup *smiley_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1173 1172
1174 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 1173 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
1175 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 1174 gtk_container_set_border_width (GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);
1176 1175
1177 /* Buddy List Themes */ 1176 /* Buddy List Themes */