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

From: Milan Crha <mcrha src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-exchange] Bug #667185 - Menu items from plugins not translated
Date: Wed, 4 Jan 2012 16:22:15 +0000 (UTC)
commit a78cf5169ed46f5d53412290dbb3fe862f201500
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 4 17:21:52 2012 +0100

    Bug #667185 - Menu items from plugins not translated

 addressbook/e-book-backend-exchange.c       |    2 ++
 addressbook/e-book-backend-gal.c            |    2 ++
 calendar/e-cal-backend-exchange-calendar.c  |    2 ++
 calendar/e-cal-backend-exchange-tasks.c     |    2 ++
 camel/camel-exchange-utils.c                |    6 ++++++
 eplugin/exchange-account-setup.c            |    4 ++--
 eplugin/exchange-calendar.c                 |    6 ++++++
 eplugin/exchange-change-password.c          |    2 ++
 eplugin/exchange-config-listener.c          |    2 ++
 eplugin/exchange-contacts.c                 |    6 ++++++
 eplugin/exchange-delegates-user.c           |    2 ++
 eplugin/exchange-delegates.c                |    2 ++
 eplugin/exchange-folder-permission.c        |   13 +++++++------
 eplugin/exchange-folder-size-display.c      |    2 +-
 eplugin/exchange-folder-subscription.c      |    2 ++
 eplugin/exchange-folder.c                   |    4 ++--
 eplugin/exchange-mail-send-options.c        |   11 ++++++++---
 eplugin/exchange-operations.c               |    6 +++++-
 eplugin/exchange-permissions-dialog.c       |    2 ++
 eplugin/exchange-send-options.c             |    2 ++
 eplugin/exchange-user-dialog.c              |    2 ++
 server/lib/e2k-autoconfig.c                 |    1 +
 server/lib/e2k-security-descriptor.c        |    2 ++
 server/lib/e2k-sid.c                        |    2 ++
 server/lib/e2k-types.h                      |    1 -
 server/storage/exchange-account.c           |    2 ++
 server/storage/exchange-hierarchy-foreign.c |    1 +
 tools/exchange-autoconfig-wizard.c          |    2 ++
 tools/ximian-connector-setup.c              |    2 ++
 29 files changed, 79 insertions(+), 16 deletions(-)
---
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index 3aaac5c..a35818b 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -21,6 +21,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <fcntl.h>
 #include <time.h>
 #include <ctype.h>
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index deecbf9..0b9a906 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
index 6792172..efe8741 100644
--- a/calendar/e-cal-backend-exchange-calendar.c
+++ b/calendar/e-cal-backend-exchange-calendar.c
@@ -21,6 +21,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
diff --git a/calendar/e-cal-backend-exchange-tasks.c b/calendar/e-cal-backend-exchange-tasks.c
index 74fc48c..6529145 100644
--- a/calendar/e-cal-backend-exchange-tasks.c
+++ b/calendar/e-cal-backend-exchange-tasks.c
@@ -21,6 +21,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <time.h>
 #include "e-cal-backend-exchange-tasks.h"
 #include <e2k-properties.h>
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index dd26354..4dac486 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -17,6 +17,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index d31923e..d70726d 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "libedataserver/e-account.h"
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-dialog-utils.h>
 #include <e2k-validate.h>
diff --git a/eplugin/exchange-calendar.c b/eplugin/exchange-calendar.c
index 30486cf..ac25e13 100644
--- a/eplugin/exchange-calendar.c
+++ b/eplugin/exchange-calendar.c
@@ -20,6 +20,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
diff --git a/eplugin/exchange-change-password.c b/eplugin/exchange-change-password.c
index 80a117f..ecf95a7 100644
--- a/eplugin/exchange-change-password.c
+++ b/eplugin/exchange-change-password.c
@@ -24,6 +24,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "exchange-change-password.h"
 
 #include <exchange-account.h>
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index a7ce013..86e9ea3 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/eplugin/exchange-contacts.c b/eplugin/exchange-contacts.c
index c4e6bab..cf25bdf 100644
--- a/eplugin/exchange-contacts.c
+++ b/eplugin/exchange-contacts.c
@@ -20,6 +20,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 3c373b0..2f81dc4 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "exchange-delegates.h"
 #include "exchange-delegates-user.h"
 
diff --git a/eplugin/exchange-delegates.c b/eplugin/exchange-delegates.c
index 9adeb7a..41bd077 100644
--- a/eplugin/exchange-delegates.c
+++ b/eplugin/exchange-delegates.c
@@ -28,6 +28,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 
 #include "exchange-delegates.h"
diff --git a/eplugin/exchange-folder-permission.c b/eplugin/exchange-folder-permission.c
index 439d384..8cd2d0f 100644
--- a/eplugin/exchange-folder-permission.c
+++ b/eplugin/exchange-folder-permission.c
@@ -22,10 +22,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
@@ -35,6 +35,7 @@
 #include <exchange-account.h>
 
 #include <e-util/e-dialog-utils.h>
+#include <e-util/e-util.h>
 #include <calendar/gui/e-cal-model.h>
 
 #include <shell/e-shell-view.h>
@@ -309,8 +310,8 @@ eex_ui_mail_init (GtkUIManager *ui_manager,
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
-	gtk_action_group_add_actions (
-		e_shell_window_get_action_group (shell_window, "mail"),
+	e_action_group_add_actions_localized (
+		e_shell_window_get_action_group (shell_window, "mail"), GETTEXT_PACKAGE,
 		mail_entries, G_N_ELEMENTS (mail_entries), shell_view);
 
 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_mail_entries_cb), NULL);
@@ -472,8 +473,8 @@ setup_source_actions (EShellView *shell_view,
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
-	gtk_action_group_add_actions (
-		e_shell_window_get_action_group (shell_window, group),
+	e_action_group_add_actions_localized (
+		e_shell_window_get_action_group (shell_window, group), GETTEXT_PACKAGE,
 		entries, NUM_ENTRIES, shell_view);
 
 	g_signal_connect (shell_view, "update-actions", G_CALLBACK (update_source_entries_cb), entries);
diff --git a/eplugin/exchange-folder-size-display.c b/eplugin/exchange-folder-size-display.c
index b26968e..caf50c7 100644
--- a/eplugin/exchange-folder-size-display.c
+++ b/eplugin/exchange-folder-size-display.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <e-util/e-dialog-utils.h>
 #include "exchange-folder-size-display.h"
 
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
index 3c2615a..2289969 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <gtk/gtk.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-folder.h>
diff --git a/eplugin/exchange-folder.c b/eplugin/exchange-folder.c
index a545a11..3e9b945 100644
--- a/eplugin/exchange-folder.c
+++ b/eplugin/exchange-folder.c
@@ -21,10 +21,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <e-folder-exchange.h>
diff --git a/eplugin/exchange-mail-send-options.c b/eplugin/exchange-mail-send-options.c
index d6f499d..125d9c8 100644
--- a/eplugin/exchange-mail-send-options.c
+++ b/eplugin/exchange-mail-send-options.c
@@ -20,13 +20,18 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <stdio.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "mail/em-event.h"
+#include <e-util/e-util.h>
 
 #include "composer/e-msg-composer.h"
 #include "composer/e-composer-from-header.h"
@@ -236,8 +241,8 @@ eex_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/eplugin/exchange-operations.c b/eplugin/exchange-operations.c
index c204c7f..c264e71 100644
--- a/eplugin/exchange-operations.c
+++ b/eplugin/exchange-operations.c
@@ -20,8 +20,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "exchange-operations.h"
 #include <e-folder-exchange.h>
diff --git a/eplugin/exchange-permissions-dialog.c b/eplugin/exchange-permissions-dialog.c
index b413003..94eb872 100644
--- a/eplugin/exchange-permissions-dialog.c
+++ b/eplugin/exchange-permissions-dialog.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "exchange-permissions-dialog.h"
 #include "exchange-hierarchy.h"
 #include "exchange-user-dialog.h"
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index 209dd20..863a838 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -24,6 +24,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 #include <libedataserverui/e-name-selector.h>
 #include <libedataserverui/e-contact-store.h>
diff --git a/eplugin/exchange-user-dialog.c b/eplugin/exchange-user-dialog.c
index c167084..2fff861 100644
--- a/eplugin/exchange-user-dialog.c
+++ b/eplugin/exchange-user-dialog.c
@@ -19,6 +19,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "exchange-user-dialog.h"
 #include "e2k-types.h"
 
diff --git a/server/lib/e2k-autoconfig.c b/server/lib/e2k-autoconfig.c
index 7bc6663..5b0cd4f 100644
--- a/server/lib/e2k-autoconfig.c
+++ b/server/lib/e2k-autoconfig.c
@@ -39,6 +39,7 @@
 #include <unistd.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 
 #ifndef G_OS_WIN32
 #include <netinet/in.h>
diff --git a/server/lib/e2k-security-descriptor.c b/server/lib/e2k-security-descriptor.c
index 91fca58..e818d25 100644
--- a/server/lib/e2k-security-descriptor.c
+++ b/server/lib/e2k-security-descriptor.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "e2k-security-descriptor.h"
 #include "e2k-sid.h"
 
diff --git a/server/lib/e2k-sid.c b/server/lib/e2k-sid.c
index a499d5d..dc96fab 100644
--- a/server/lib/e2k-sid.c
+++ b/server/lib/e2k-sid.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "e2k-sid.h"
 
 #include <stdlib.h>
diff --git a/server/lib/e2k-types.h b/server/lib/e2k-types.h
index f8f88f9..9bb2934 100644
--- a/server/lib/e2k-types.h
+++ b/server/lib/e2k-types.h
@@ -5,7 +5,6 @@
 #define __E2K_TYPES_H__
 
 #include <glib.h>
-#include <glib/gi18n.h>
 
 typedef struct _E2kAction                     E2kAction;
 typedef struct _E2kAddrEntry                  E2kAddrEntry;
diff --git a/server/storage/exchange-account.c b/server/storage/exchange-account.c
index d24c9c5..28011b7 100644
--- a/server/storage/exchange-account.c
+++ b/server/storage/exchange-account.c
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n-lib.h>
+
 #include "camel-exchange-settings.h"
 #include "exchange-account.h"
 #include "exchange-hierarchy-webdav.h"
diff --git a/server/storage/exchange-hierarchy-foreign.c b/server/storage/exchange-hierarchy-foreign.c
index 42f2394..2ef51a8 100644
--- a/server/storage/exchange-hierarchy-foreign.c
+++ b/server/storage/exchange-hierarchy-foreign.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 
 #include "libedataserver/e-source-list.h"
 #include "libedataserver/e-xml-hash-utils.h"
diff --git a/tools/exchange-autoconfig-wizard.c b/tools/exchange-autoconfig-wizard.c
index 9a51e0e..04bb2c7 100644
--- a/tools/exchange-autoconfig-wizard.c
+++ b/tools/exchange-autoconfig-wizard.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n.h>
+
 #include <string.h>
 
 #include "e2k-autoconfig.h"
diff --git a/tools/ximian-connector-setup.c b/tools/ximian-connector-setup.c
index 2f7c106..575a5c7 100644
--- a/tools/ximian-connector-setup.c
+++ b/tools/ximian-connector-setup.c
@@ -21,6 +21,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n.h>
+
 #include <gtk/gtk.h>
 #include <libedataserverui/e-passwords.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]