/pidgin/main: ad957d0a467a: Keyring (and some GTK): fix translat...

[Tomasz Wasilczyk]

Changeset: ad957d0a467aba4a989e7508118ad051f9367651
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-08-06 16:05 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/ad957d0a467a

Description:

Keyring (and some GTK): fix translation callbacks

diffstat:

 libpurple/plugins/keyrings/gnomekeyring.c    |   2 +-
 libpurple/plugins/keyrings/internalkeyring.c |   2 +-
 libpurple/plugins/keyrings/kwallet.cpp       |   2 +-
 libpurple/plugins/keyrings/secretservice.c   |   2 +-
 libpurple/plugins/keyrings/wincred.c         |   2 +-
 pidgin/gtkprefs.c                            |   6 +++---
 pidgin/gtkwebviewtoolbar.c                   |  17 +++++++++--------
 7 files changed, 17 insertions(+), 16 deletions(-)

diffs (117 lines):

diff --git a/libpurple/plugins/keyrings/gnomekeyring.c b/libpurple/plugins/keyrings/gnomekeyring.c
--- a/libpurple/plugins/keyrings/gnomekeyring.c
+++ b/libpurple/plugins/keyrings/gnomekeyring.c
@@ -388,7 +388,7 @@ gnomekeyring_load(PurplePlugin *plugin)
 
 	keyring_handler = purple_keyring_new();
 
-	purple_keyring_set_name(keyring_handler, GNOMEKEYRING_NAME);
+	purple_keyring_set_name(keyring_handler, _(GNOMEKEYRING_NAME));
 	purple_keyring_set_id(keyring_handler, GNOMEKEYRING_ID);
 	purple_keyring_set_read_password(keyring_handler, gnomekeyring_read);
 	purple_keyring_set_save_password(keyring_handler, gnomekeyring_save);
diff --git a/libpurple/plugins/keyrings/internalkeyring.c b/libpurple/plugins/keyrings/internalkeyring.c
--- a/libpurple/plugins/keyrings/internalkeyring.c
+++ b/libpurple/plugins/keyrings/internalkeyring.c
@@ -955,7 +955,7 @@ intkeyring_load(PurplePlugin *plugin)
 {
 	keyring_handler = purple_keyring_new();
 
-	purple_keyring_set_name(keyring_handler, INTKEYRING_NAME);
+	purple_keyring_set_name(keyring_handler, _(INTKEYRING_NAME));
 	purple_keyring_set_id(keyring_handler, INTKEYRING_ID);
 	purple_keyring_set_read_password(keyring_handler,
 		intkeyring_read);
diff --git a/libpurple/plugins/keyrings/kwallet.cpp b/libpurple/plugins/keyrings/kwallet.cpp
--- a/libpurple/plugins/keyrings/kwallet.cpp
+++ b/libpurple/plugins/keyrings/kwallet.cpp
@@ -505,7 +505,7 @@ kwallet_load(PurplePlugin *plugin)
 
 	keyring_handler = purple_keyring_new();
 
-	purple_keyring_set_name(keyring_handler, KWALLET_NAME);
+	purple_keyring_set_name(keyring_handler, _(KWALLET_NAME));
 	purple_keyring_set_id(keyring_handler, KWALLET_ID);
 	purple_keyring_set_read_password(keyring_handler, kwallet_read);
 	purple_keyring_set_save_password(keyring_handler, kwallet_save);
diff --git a/libpurple/plugins/keyrings/secretservice.c b/libpurple/plugins/keyrings/secretservice.c
--- a/libpurple/plugins/keyrings/secretservice.c
+++ b/libpurple/plugins/keyrings/secretservice.c
@@ -257,7 +257,7 @@ ss_init(void)
 {
 	keyring_handler = purple_keyring_new();
 
-	purple_keyring_set_name(keyring_handler, SECRETSERVICE_NAME);
+	purple_keyring_set_name(keyring_handler, _(SECRETSERVICE_NAME));
 	purple_keyring_set_id(keyring_handler, SECRETSERVICE_ID);
 	purple_keyring_set_read_password(keyring_handler, ss_read);
 	purple_keyring_set_save_password(keyring_handler, ss_save);
diff --git a/libpurple/plugins/keyrings/wincred.c b/libpurple/plugins/keyrings/wincred.c
--- a/libpurple/plugins/keyrings/wincred.c
+++ b/libpurple/plugins/keyrings/wincred.c
@@ -260,7 +260,7 @@ wincred_load(PurplePlugin *plugin)
 {
 	keyring_handler = purple_keyring_new();
 
-	purple_keyring_set_name(keyring_handler, WINCRED_NAME);
+	purple_keyring_set_name(keyring_handler, _(WINCRED_NAME));
 	purple_keyring_set_id(keyring_handler, WINCRED_ID);
 	purple_keyring_set_read_password(keyring_handler, wincred_read);
 	purple_keyring_set_save_password(keyring_handler, wincred_save);
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -146,7 +146,7 @@ static const gchar *AUDIO_SRC_PLUGINS[] 
 	"pulsesrc",	"PulseAudio",
 	"sndiosrc",	"sndio",
 	/* "audiotestsrc wave=silence", "Silence", */
-	"audiotestsrc",	"Test Sound",
+	"audiotestsrc",	N_("Test Sound"),
 	NULL
 };
 
@@ -164,7 +164,7 @@ static const gchar *AUDIO_SINK_PLUGINS[]
 
 static const gchar *VIDEO_SRC_PLUGINS[] = {
 	"videodisabledsrc",	N_("Disabled"),
-	"videotestsrc",	"Test Input",
+	"videotestsrc",	N_("Test Input"),
 	"dshowvideosrc","DirectDraw",
 	"ksvideosrc",	"KS Video",
 	"qcamsrc",	"Quickcam",
@@ -3612,7 +3612,7 @@ get_vv_element_plugins(const gchar **plu
 #endif
 			|| g_strcmp0(plugins[0], "videodisabledsrc") == 0)
 		{
-			ret = g_list_prepend(ret, (gpointer)plugins[1]);
+			ret = g_list_prepend(ret, (gpointer)_(plugins[1]));
 			ret = g_list_prepend(ret, (gpointer)plugins[0]);
 		}
 	}
diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -1343,14 +1343,15 @@ gtk_webviewtoolbar_create_actions(GtkWeb
 
 	for (i = 0; i < G_N_ELEMENTS(actions); i++) {
 		GtkAction *action;
-		if (actions[i].toggle)
-			action = GTK_ACTION(gtk_toggle_action_new(actions[i].name,
-			                                          actions[i].label,
-			                                          actions[i].tooltip,
-			                                          actions[i].stock));
-		else
-			action = gtk_action_new(actions[i].name, actions[i].label,
-			                        actions[i].tooltip, actions[i].stock);
+		if (actions[i].toggle) {
+			action = GTK_ACTION(gtk_toggle_action_new(
+				actions[i].name, _(actions[i].label),
+				_(actions[i].tooltip), actions[i].stock));
+		} else {
+			action = gtk_action_new(actions[i].name,
+				_(actions[i].label), _(actions[i].tooltip),
+				actions[i].stock);
+		}
 		gtk_action_set_is_important(action, TRUE);
 		gtk_action_group_add_action(action_group, action);
 		g_signal_connect(G_OBJECT(action), "activate", actions[i].cb, toolbar);