[evolution-rss] Bug 584296 – i18n does not work

[Lucian Langa <lucilanga src gnome org>]

commit 99fcaffbd4923cb7439037eb1c2f9c87f8b31b16
Author: Gabor Kelemen <kelemeng gnome hu>
Date:   Sat May 30 18:13:16 2009 +0300

    Bug 584296 â?? i18n does not work
---
 src/dbus.c               |    2 +-
 src/parser.c             |    2 +-
 src/rss-config-factory.c |    7 ++++---
 src/rss.c                |    3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/dbus.c b/src/dbus.c
index b1b2a10..f961855 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <gtk/gtk.h>
diff --git a/src/parser.c b/src/parser.c
index 8c76278..750d1d3 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -17,7 +17,7 @@
  */
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <libxml/parserInternals.h>
 #include <libxml/xmlmemory.h>
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 9ddff98..5ff826c 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -41,6 +41,7 @@
 #include "rss.h"
 #include "misc.h"
 #include "parser.h"
+#include <glib/gi18n-lib.h>
 
 #define d(x)
 
@@ -342,7 +343,7 @@ build_dialog_add(gchar *url, gchar *feed_text)
         gladefile = g_build_filename (EVOLUTION_GLADEDIR,
                                       "rss-ui.glade",
                                       NULL);
-        gui = glade_xml_new (gladefile, NULL, NULL);
+        gui = glade_xml_new (gladefile, NULL, GETTEXT_PACKAGE);
         g_free (gladefile);
 
         GtkWidget *dialog1 = (GtkWidget *)glade_xml_get_widget (gui, "feed_dialog");
@@ -1625,7 +1626,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
         gladefile = g_build_filename (EVOLUTION_GLADEDIR,
                         "rss-html-rendering.glade",
                         NULL);
-        ui->xml = glade_xml_new (gladefile, "settingsbox", NULL);
+        ui->xml = glade_xml_new (gladefile, "settingsbox", GETTEXT_PACKAGE);
         g_free (gladefile);
 
 
@@ -1887,7 +1888,7 @@ rss_config_control_new (void)
         gladefile = g_build_filename (EVOLUTION_GLADEDIR,
                                       "rss-ui.glade",
                                       NULL);
-        sf->gui = glade_xml_new (gladefile, NULL, NULL);
+        sf->gui = glade_xml_new (gladefile, NULL, GETTEXT_PACKAGE);
         g_free (gladefile);
 
         GtkTreeView *treeview = (GtkTreeView *)glade_xml_get_widget (sf->gui, "feeds-treeview");
diff --git a/src/rss.c b/src/rss.c
index d98a083..59dbfb6 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -141,6 +141,7 @@ int rss_verbose_debug = 0;
 #include "rss-config-factory.h"
 #include "rss-icon-factory.h"
 #include "parser.h"
+#include <glib/gi18n-lib.h>
 
 int pop = 0;
 GtkWidget *flabel;
@@ -3975,7 +3976,7 @@ int
 e_plugin_lib_enable(EPluginLib *ep, int enable)
 {
 	if (enable) {
-		bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+		bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
 		bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 		rss_gconf = gconf_client_get_default();
 		upgrade = 1;