Attachment 3914 Details for Bug 21176 – Патч к gtkprefs.c

[patch] Патч к gtkprefs.c

pidgin-2.6.2-alt-l10n.patch (text/plain), 4.78 KB, created by tt on 2009-09-21 16:18:56 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: tt

Created: 2009-09-21 16:18:56 MSD

Size: 4.78 KB

patch

obsolete

>--- pidgin-2.6.2/pidgin/gtkprefs.c	2009-09-21 07:20:57 +0200
>+++ pidgin-2.6.2/pidgin/gtkprefs.c.NEW	2009-09-21 07:31:25 +0200
>@@ -57,6 +57,8 @@
> #include "gtkutils.h"
> #include "pidginstock.h"
> 
>+#include <string.h>
>+
> #define PROXYHOST 0
> #define PROXYPORT 1
> #define PROXYUSER 2
>@@ -460,6 +462,10 @@
> }
> 
> /* Rebuild the markup for the sound theme selection for "(Custom)" themes */
>+		
>+static char
>+_str_The_default_Pidgin_sound_theme [1024];
>+
> static void
> pref_sound_generate_markup(void)
> {
>@@ -469,6 +475,23 @@
> 	PurpleSoundTheme *theme;
> 	GtkTreeIter iter;
> 
>+	static int first_call = 1;
>+	
>+	if (first_call) { /* FIXME: this should be done in a regular way */
>+
>+		_str_The_default_Pidgin_sound_theme [0] = '\0';
>+
>+		strcat (_str_The_default_Pidgin_sound_theme, "(");
>+		strcat (_str_The_default_Pidgin_sound_theme, _("Default") );
>+		strcat (_str_The_default_Pidgin_sound_theme, ")%s%s - ");
>+		strcat (_str_The_default_Pidgin_sound_theme, _("None") );
>+		strcat (_str_The_default_Pidgin_sound_theme, "\n");
>+		strcat (_str_The_default_Pidgin_sound_theme, _("The default Pidgin sound theme") );
>+		strcat (_str_The_default_Pidgin_sound_theme, "");
>+
>+		first_call = 0;
>+	}
>+
> 	customized = pidgin_sound_is_customized();
> 	current_theme = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/theme");
> 
>@@ -479,8 +502,8 @@
> 			print_custom = customized && g_str_equal(current_theme, name);
> 
> 			if (!name || *name == '\0')
>-				markup = g_strdup_printf("(Default)%s%s - None\nThe default Pidgin sound theme",
>-							 print_custom ? " " : "", print_custom ? "(Custom)" : "");
>+				markup = g_strdup_printf(_str_The_default_Pidgin_sound_theme,
>+							 print_custom ? " " : "", print_custom ? _("(Custom)") : "");
> 			else {
> 				theme = PURPLE_SOUND_THEME(purple_theme_manager_find_theme(name, "sound"));
> 				author = purple_theme_get_author(PURPLE_THEME(theme));
>@@ -575,6 +598,10 @@
> 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
> }
> 
>+static char 
>+_str_The_default_Pidgin_buddy_list_theme [1024],
>+_str_The_default_Pidgin_status_icon_theme [1024];
>+
> static void
> prefs_themes_refresh(void)
> {
>@@ -582,6 +609,32 @@
> 	gchar *filename;
> 	GtkTreeIter iter;
> 
>+	static int first_call = 1;
>+	
>+	if (first_call) { /* FIXME: this should be done in a regular way */
>+
>+		_str_The_default_Pidgin_buddy_list_theme [0] =
>+		_str_The_default_Pidgin_status_icon_theme[0] = '\0';
>+
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, "(");
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, _("Default") );
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, ") - ");
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, _("None") );
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, "\n");
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, _("The default Pidgin buddy list theme") );
>+		strcat (_str_The_default_Pidgin_buddy_list_theme, "");
>+
>+		strcat (_str_The_default_Pidgin_status_icon_theme, "(");
>+		strcat (_str_The_default_Pidgin_status_icon_theme, _("Default") );
>+		strcat (_str_The_default_Pidgin_status_icon_theme, ") - ");
>+		strcat (_str_The_default_Pidgin_status_icon_theme, _("None") );
>+		strcat (_str_The_default_Pidgin_status_icon_theme, "\n");
>+		strcat (_str_The_default_Pidgin_status_icon_theme, _("The default Pidgin status icon theme") );
>+		strcat (_str_The_default_Pidgin_status_icon_theme, "");
>+
>+		first_call = 0;
>+	}
>+
> 	prefs_sound_themes_loading = TRUE;
> 	/* refresh the list of themes in the manager */
> 	purple_theme_manager_refresh();
>@@ -599,15 +652,13 @@
> 	gtk_list_store_clear(prefs_blist_themes);
> 	gtk_list_store_append(prefs_blist_themes, &iter);
> 	gtk_list_store_set(prefs_blist_themes, &iter, 0, pixbuf, 1,
>-	 "(Default) - None\n"
>-	 "The default Pidgin buddy list theme", 2, "", -1);
>+	 _str_The_default_Pidgin_buddy_list_theme, 2, "", -1);
> 
> 	/* status icon themes */
> 	gtk_list_store_clear(prefs_status_icon_themes);
> 	gtk_list_store_append(prefs_status_icon_themes, &iter);
> 	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1,
>-	 "(Default) - None\n"
>-	 "The default Pidgin status icon theme", 2, "", -1);
>+	 _str_The_default_Pidgin_status_icon_theme, 2, "", -1);
> 	g_object_unref(G_OBJECT(pixbuf));
> 
> 	purple_theme_manager_for_each_theme(prefs_themes_sort);
>@@ -1784,7 +1835,7 @@
> 			G_CALLBACK(network_stun_server_changed_cb), NULL);
> 	gtk_widget_show(entry);
> 
>-	pidgin_add_widget_to_vbox(GTK_BOX(vbox), "ST_UN server:",
>+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("ST_UN server:"),
> 			sg, entry, TRUE, NULL);
> 
> 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);

Actions: View | Diff

Attachments on bug 21176: 3881 | 3882 | 3887 | 3888 | 3914 | 3915 | 4119 | 4253 | 4319