View | Details | Raw Unified | Return to bug 21176
Collapse All | Expand All

(-)pidgin-2.6.2/pidgin/gtkprefs.c (-7 / +58 lines)
Lines 57-62 Link Here
57
#include "gtkutils.h"
57
#include "gtkutils.h"
58
#include "pidginstock.h"
58
#include "pidginstock.h"
59
59
60
#include <string.h>
61
60
#define PROXYHOST 0
62
#define PROXYHOST 0
61
#define PROXYPORT 1
63
#define PROXYPORT 1
62
#define PROXYUSER 2
64
#define PROXYUSER 2
Lines 460-465 Link Here
460
}
462
}
461
463
462
/* Rebuild the markup for the sound theme selection for "(Custom)" themes */
464
/* Rebuild the markup for the sound theme selection for "(Custom)" themes */
465
		
466
static char
467
_str_The_default_Pidgin_sound_theme [1024];
468
463
static void
469
static void
464
pref_sound_generate_markup(void)
470
pref_sound_generate_markup(void)
465
{
471
{
Lines 469-474 Link Here
469
	PurpleSoundTheme *theme;
475
	PurpleSoundTheme *theme;
470
	GtkTreeIter iter;
476
	GtkTreeIter iter;
471
477
478
	static int first_call = 1;
479
	
480
	if (first_call) { /* FIXME: this should be done in a regular way */
481
482
		_str_The_default_Pidgin_sound_theme [0] = '\0';
483
484
		strcat (_str_The_default_Pidgin_sound_theme, "<b>(");
485
		strcat (_str_The_default_Pidgin_sound_theme, _("Default") );
486
		strcat (_str_The_default_Pidgin_sound_theme, ")</b>%s%s - ");
487
		strcat (_str_The_default_Pidgin_sound_theme, _("None") );
488
		strcat (_str_The_default_Pidgin_sound_theme, "\n<span foreground='dim grey'>");
489
		strcat (_str_The_default_Pidgin_sound_theme, _("The default Pidgin sound theme") );
490
		strcat (_str_The_default_Pidgin_sound_theme, "</span>");
491
492
		first_call = 0;
493
	}
494
472
	customized = pidgin_sound_is_customized();
495
	customized = pidgin_sound_is_customized();
473
	current_theme = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme");
496
	current_theme = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme");
474
497
Lines 479-486 Link Here
479
			print_custom = customized && g_str_equal(current_theme, name);
502
			print_custom = customized && g_str_equal(current_theme, name);
480
503
481
			if (!name || *name == '\0')
504
			if (!name || *name == '\0')
482
				markup = g_strdup_printf("<b>(Default)</b>%s%s - None\n<span foreground='dim grey'>The default Pidgin sound theme</span>",
505
				markup = g_strdup_printf(_str_The_default_Pidgin_sound_theme,
483
							 print_custom ? " " : "", print_custom ? "(Custom)" : "");
506
							 print_custom ? " " : "", print_custom ? _("(Custom)") : "");
484
			else {
507
			else {
485
				theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(name, "sound"));
508
				theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(name, "sound"));
486
				author = purple_theme_get_author(PURPLE_THEME(theme));
509
				author = purple_theme_get_author(PURPLE_THEME(theme));
Lines 575-580 Link Here
575
		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
598
		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
576
}
599
}
577
600
601
static char 
602
_str_The_default_Pidgin_buddy_list_theme  [1024],
603
_str_The_default_Pidgin_status_icon_theme [1024];
604
578
static void
605
static void
579
prefs_themes_refresh(void)
606
prefs_themes_refresh(void)
580
{
607
{
Lines 582-587 Link Here
582
	gchar *filename;
609
	gchar *filename;
583
	GtkTreeIter iter;
610
	GtkTreeIter iter;
584
611
612
	static int first_call = 1;
613
	
614
	if (first_call) { /* FIXME: this should be done in a regular way */
615
616
		_str_The_default_Pidgin_buddy_list_theme [0] =
617
		_str_The_default_Pidgin_status_icon_theme[0] = '\0';
618
619
		strcat (_str_The_default_Pidgin_buddy_list_theme, "<b>(");
620
		strcat (_str_The_default_Pidgin_buddy_list_theme, _("Default") );
621
		strcat (_str_The_default_Pidgin_buddy_list_theme, ")</b> - ");
622
		strcat (_str_The_default_Pidgin_buddy_list_theme, _("None") );
623
		strcat (_str_The_default_Pidgin_buddy_list_theme, "\n<span color='dim grey'>");
624
		strcat (_str_The_default_Pidgin_buddy_list_theme, _("The default Pidgin buddy list theme") );
625
		strcat (_str_The_default_Pidgin_buddy_list_theme, "</span>");
626
627
		strcat (_str_The_default_Pidgin_status_icon_theme, "<b>(");
628
		strcat (_str_The_default_Pidgin_status_icon_theme, _("Default") );
629
		strcat (_str_The_default_Pidgin_status_icon_theme, ")</b> - ");
630
		strcat (_str_The_default_Pidgin_status_icon_theme, _("None") );
631
		strcat (_str_The_default_Pidgin_status_icon_theme, "\n<span color='dim grey'>");
632
		strcat (_str_The_default_Pidgin_status_icon_theme, _("The default Pidgin status icon theme") );
633
		strcat (_str_The_default_Pidgin_status_icon_theme, "</span>");
634
635
		first_call = 0;
636
	}
637
585
	prefs_sound_themes_loading = TRUE;
638
	prefs_sound_themes_loading = TRUE;
586
	/* refresh the list of themes in the manager */
639
	/* refresh the list of themes in the manager */
587
	purple_theme_manager_refresh();
640
	purple_theme_manager_refresh();
Lines 599-613 Link Here
599
	gtk_list_store_clear(prefs_blist_themes);
652
	gtk_list_store_clear(prefs_blist_themes);
600
	gtk_list_store_append(prefs_blist_themes, &iter);
653
	gtk_list_store_append(prefs_blist_themes, &iter);
601
	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1,
654
	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1,
602
	                   "<b>(Default)</b> - None\n<span color='dim grey'>"
655
	                   _str_The_default_Pidgin_buddy_list_theme, 2, "", -1);
603
	                   "The default Pidgin buddy list theme</span>", 2, "", -1);
604
656
605
	/* status icon themes */
657
	/* status icon themes */
606
	gtk_list_store_clear(prefs_status_icon_themes);
658
	gtk_list_store_clear(prefs_status_icon_themes);
607
	gtk_list_store_append(prefs_status_icon_themes, &iter);
659
	gtk_list_store_append(prefs_status_icon_themes, &iter);
608
	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1,
660
	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1,
609
	                   "<b>(Default)</b> - None\n<span color='dim grey'>"
661
	                   _str_The_default_Pidgin_status_icon_theme, 2, "", -1);
610
	                   "The default Pidgin status icon theme</span>", 2, "", -1);
611
	g_object_unref(G_OBJECT(pixbuf));
662
	g_object_unref(G_OBJECT(pixbuf));
612
663
613
	purple_theme_manager_for_each_theme(prefs_themes_sort);
664
	purple_theme_manager_for_each_theme(prefs_themes_sort);
Lines 1784-1790 Link Here
1784
			G_CALLBACK(network_stun_server_changed_cb), NULL);
1835
			G_CALLBACK(network_stun_server_changed_cb), NULL);
1785
	gtk_widget_show(entry);
1836
	gtk_widget_show(entry);
1786
1837
1787
	pidgin_add_widget_to_vbox(GTK_BOX(vbox), "ST_UN server:",
1838
	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("ST_UN server:"),
1788
			sg, entry, TRUE, NULL);
1839
			sg, entry, TRUE, NULL);
1789
1840
1790
	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
1841
	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);

Return to bug 21176