[evolution-groupwise] Bug #667185 - Menu items from plugins not translated

[Milan Crha <mcrha src gnome org>]

commit ae5d1cf95e0c51d78c8bb28ff27702faae4bedea
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 4 17:22:59 2012 +0100

    Bug #667185 - Menu items from plugins not translated

 src/calendar/e-cal-backend-groupwise-utils.c |    2 +-
 src/plugins/addressbook-groupwise.c          |    6 +++++-
 src/plugins/camel-gw-listener.c              |    2 +-
 src/plugins/gw-ui.c                          |   25 +++++++++++++++----------
 src/plugins/install-shared.c                 |    2 +-
 src/plugins/junk-settings.c                  |    3 ++-
 src/plugins/mail-send-options.c              |   12 +++++++++---
 src/plugins/process-meeting.c                |    2 +-
 src/plugins/proxy-login.c                    |    2 +-
 src/plugins/proxy.c                          |    2 +-
 src/plugins/send-options.c                   |    2 +-
 src/plugins/share-folder-common.c            |    3 ++-
 12 files changed, 40 insertions(+), 23 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-groupwise-utils.c b/src/calendar/e-cal-backend-groupwise-utils.c
index 83e812c..11d5765 100644
--- a/src/calendar/e-cal-backend-groupwise-utils.c
+++ b/src/calendar/e-cal-backend-groupwise-utils.c
@@ -34,7 +34,7 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
diff --git a/src/plugins/addressbook-groupwise.c b/src/plugins/addressbook-groupwise.c
index d396c6e..b9f3aed 100644
--- a/src/plugins/addressbook-groupwise.c
+++ b/src/plugins/addressbook-groupwise.c
@@ -19,12 +19,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-group.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
 void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index 6773725..8188569 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -27,7 +27,7 @@
 #include "camel-gw-listener.h"
 #include "camel-groupwise-settings.h"
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <camel/camel.h>
 #include <e-gw-connection.h>
 #include <libedataserverui/e-passwords.h>
diff --git a/src/plugins/gw-ui.c b/src/plugins/gw-ui.c
index e80b066..2896f46 100644
--- a/src/plugins/gw-ui.c
+++ b/src/plugins/gw-ui.c
@@ -17,10 +17,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <e-util/e-account-utils.h>
+#include <e-util/e-util.h>
 
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window.h>
@@ -166,9 +171,9 @@ gw_ui_mail_folder_popup (GtkUIManager *ui_manager,
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	action_group = e_shell_window_get_action_group (shell_window, "mail");
 
-	gtk_action_group_add_actions (
-		action_group, mfp_entries,
-		G_N_ELEMENTS (mfp_entries), shell_view);
+	e_action_group_add_actions_localized (
+		action_group, GETTEXT_PACKAGE,
+		mfp_entries, G_N_ELEMENTS (mfp_entries), shell_view);
 
 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_mfp_entries_cb), NULL);
 
@@ -260,9 +265,9 @@ gw_ui_mail_message_popup (GtkUIManager *ui_manager,
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	action_group = e_shell_window_get_action_group (shell_window, "mail");
 
-	gtk_action_group_add_actions (
-		action_group, mmp_entries,
-		G_N_ELEMENTS (mmp_entries), shell_view);
+	e_action_group_add_actions_localized (
+		action_group, GETTEXT_PACKAGE,
+		mmp_entries, G_N_ELEMENTS (mmp_entries), shell_view);
 
 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_mmp_entries_cb), NULL);
 
@@ -467,9 +472,9 @@ gw_ui_calendar_event_popup (GtkUIManager *ui_manager,
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	action_group = e_shell_window_get_action_group (shell_window, "calendar");
 
-	gtk_action_group_add_actions (
-		action_group, cal_entries,
-		G_N_ELEMENTS (cal_entries), shell_view);
+	e_action_group_add_actions_localized (
+		action_group, GETTEXT_PACKAGE,
+		cal_entries, G_N_ELEMENTS (cal_entries), shell_view);
 
 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_cal_entries_cb), NULL);
 
diff --git a/src/plugins/install-shared.c b/src/plugins/install-shared.c
index fba2d70..403f50d 100644
--- a/src/plugins/install-shared.c
+++ b/src/plugins/install-shared.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-config.h>
 #include <e-util/e-account-utils.h>
diff --git a/src/plugins/junk-settings.c b/src/plugins/junk-settings.c
index a4136fb..8e0d23b 100644
--- a/src/plugins/junk-settings.c
+++ b/src/plugins/junk-settings.c
@@ -23,9 +23,10 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
+
 #include "junk-settings.h"
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <e-util/e-util.h>
 #include <e-gw-connection.h>
 #define ROOTNODE "vboxSettings"
diff --git a/src/plugins/mail-send-options.c b/src/plugins/mail-send-options.c
index 24e9f4c..43af876 100644
--- a/src/plugins/mail-send-options.c
+++ b/src/plugins/mail-send-options.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -28,7 +32,9 @@
 #include <stdio.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
+
+#include <e-util/e-util.h>
 
 #include "mail-send-options.h"
 
@@ -217,8 +223,8 @@ gw_ui_composer_actions (GtkUIManager *manager,
 	editor = GTKHTML_EDITOR (composer);
 
 	/* Add actions to the "composer" action group. */
-	gtk_action_group_add_actions (
-		gtkhtml_editor_get_action_group (editor, "composer"),
+	e_action_group_add_actions_localized (
+		gtkhtml_editor_get_action_group (editor, "composer"), GETTEXT_PACKAGE,
 		entries, G_N_ELEMENTS (entries), composer);
 
 	headers = e_msg_composer_get_header_table (composer);
diff --git a/src/plugins/process-meeting.c b/src/plugins/process-meeting.c
index 2af8033..f00f385 100644
--- a/src/plugins/process-meeting.c
+++ b/src/plugins/process-meeting.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <fcntl.h>
 #include <gtk/gtk.h>
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index 72e7892..9c76625 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <libedataserverui/e-passwords.h>
 #include <mail/em-folder-tree.h>
diff --git a/src/plugins/proxy.c b/src/plugins/proxy.c
index 43baa10..11be50c 100644
--- a/src/plugins/proxy.c
+++ b/src/plugins/proxy.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <libedataserverui/e-contact-store.h>
 
diff --git a/src/plugins/send-options.c b/src/plugins/send-options.c
index 74ceecf..ee5482f 100644
--- a/src/plugins/send-options.c
+++ b/src/plugins/send-options.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include "camel-groupwise-settings.h"
 #include "mail/em-account-editor.h"
diff --git a/src/plugins/share-folder-common.c b/src/plugins/share-folder-common.c
index dcc719e..e5f4cff 100644
--- a/src/plugins/share-folder-common.c
+++ b/src/plugins/share-folder-common.c
@@ -24,10 +24,11 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <e-util/e-config.h>
 #include <e-util/e-account-utils.h>
 #include <mail/e-mail-backend.h>