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

(-)pidgin/gtkprefs.c.orig (-8 / +39 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 573-578 Link Here
573
		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
575
		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
574
}
576
}
575
577
578
static char 
579
_str_The_default_Pidgin_buddy_list_theme  [1024],
580
_str_The_default_Pidgin_status_icon_theme [1024];
581
576
static void
582
static void
577
prefs_themes_refresh(void)
583
prefs_themes_refresh(void)
578
{
584
{
Lines 580-585 Link Here
580
	gchar *filename;
586
	gchar *filename;
581
	GtkTreeIter iter;
587
	GtkTreeIter iter;
582
588
589
	static int first_call = 1;
590
591
	if (first_call) { /* FIXME: this should be done in a regular way */
592
		
593
		_str_The_default_Pidgin_buddy_list_theme [0] = 
594
		_str_The_default_Pidgin_status_icon_theme[0] = '\0';
595
		
596
		strcat (_str_The_default_Pidgin_buddy_list_theme, "<b>(");
597
		strcat (_str_The_default_Pidgin_buddy_list_theme, _("Default") );
598
		strcat (_str_The_default_Pidgin_buddy_list_theme, ")</b> - ");
599
		strcat (_str_The_default_Pidgin_buddy_list_theme, _("None") );
600
		strcat (_str_The_default_Pidgin_buddy_list_theme, "\n<span color='dim grey'>");
601
		strcat (_str_The_default_Pidgin_buddy_list_theme, _("The default Pidgin buddy list theme") );
602
		strcat (_str_The_default_Pidgin_buddy_list_theme, "</span>");
603
604
		strcat (_str_The_default_Pidgin_status_icon_theme, "<b>(");
605
		strcat (_str_The_default_Pidgin_status_icon_theme, _("Default") );
606
		strcat (_str_The_default_Pidgin_status_icon_theme, ")</b> - ");
607
		strcat (_str_The_default_Pidgin_status_icon_theme, _("None") );
608
		strcat (_str_The_default_Pidgin_status_icon_theme, "\n<span color='dim grey'>");
609
		strcat (_str_The_default_Pidgin_status_icon_theme, _("The default Pidgin status icon theme") );
610
		strcat (_str_The_default_Pidgin_status_icon_theme, "</span>");
611
612
		first_call = 0;
613
	}
614
583
	/* refresh the list of themes in the manager */
615
	/* refresh the list of themes in the manager */
584
	purple_theme_manager_refresh();
616
	purple_theme_manager_refresh();
585
617
Lines 596-610 Link Here
596
	gtk_list_store_clear(prefs_blist_themes);
628
	gtk_list_store_clear(prefs_blist_themes);
597
	gtk_list_store_append(prefs_blist_themes, &iter);
629
	gtk_list_store_append(prefs_blist_themes, &iter);
598
	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1,
630
	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1,
599
	                   "<b>(Default)</b> - None\n<span color='dim grey'>"
631
	                   _str_The_default_Pidgin_buddy_list_theme, 2, "", -1);
600
	                   "The default Pidgin buddy list theme___</span>", 2, "", -1);
601
632
602
	/* status icon themes */
633
	/* status icon themes */
603
	gtk_list_store_clear(prefs_status_icon_themes);
634
	gtk_list_store_clear(prefs_status_icon_themes);
604
	gtk_list_store_append(prefs_status_icon_themes, &iter);
635
	gtk_list_store_append(prefs_status_icon_themes, &iter);
605
	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1,
636
	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1,
606
	                   "<b>(Default)</b> - None\n<span color='dim grey'>"
637
	                   _str_The_default_Pidgin_status_icon_theme, 2, "", -1);
607
	                   "The default Pidgin status icon theme</span>", 2, "", -1);
638
608
	g_object_unref(G_OBJECT(pixbuf));
639
	g_object_unref(G_OBJECT(pixbuf));
609
640
610
	purple_theme_manager_for_each_theme(prefs_themes_sort);
641
	purple_theme_manager_for_each_theme(prefs_themes_sort);
Lines 1770-1776 Link Here
1770
			G_CALLBACK(network_stun_server_changed_cb), NULL);
1801
			G_CALLBACK(network_stun_server_changed_cb), NULL);
1771
	gtk_widget_show(entry);
1802
	gtk_widget_show(entry);
1772
1803
1773
	pidgin_add_widget_to_vbox(GTK_BOX(vbox), "ST_UN server:",
1804
	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("ST_UN server:"),
1774
			sg, entry, TRUE, NULL);
1805
			sg, entry, TRUE, NULL);
1775
1806
1776
	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
1807
	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
Lines 1877-1890 Link Here
1877
			G_CALLBACK(network_turn_server_changed_cb), NULL);
1908
			G_CALLBACK(network_turn_server_changed_cb), NULL);
1878
	gtk_widget_show(entry);
1909
	gtk_widget_show(entry);
1879
1910
1880
	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), "_TURN server:",
1911
	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"),
1881
			sg, entry, TRUE, NULL);
1912
			sg, entry, TRUE, NULL);
1882
1913
1883
	pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
1914
	pidgin_prefs_labeled_spin_button(hbox, _("_Port:"),
1884
		"/purple/network/turn_port", 0, 65535, NULL);
1915
		"/purple/network/turn_port", 0, 65535, NULL);
1885
	hbox = pidgin_prefs_labeled_entry(vbox, "_Username:",
1916
	hbox = pidgin_prefs_labeled_entry(vbox, _("_Username:"),
1886
		"/purple/network/turn_username", sg);
1917
		"/purple/network/turn_username", sg);
1887
	pidgin_prefs_labeled_password(hbox, "_Password:",
1918
	pidgin_prefs_labeled_password(hbox, _("_Password:"),
1888
		"/purple/network/turn_password", NULL);
1919
		"/purple/network/turn_password", NULL);
1889
1920
1890
	if (purple_running_gnome()) {
1921
	if (purple_running_gnome()) {

Return to bug 21176