From ab223625f15bae56e5b32b4798e87cf0e4b04944 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rob@linux.intel.com>
Date: Tue, 18 May 2010 11:09:45 +0100
Subject: Use library i18n method for source files included in shared library

Since these files are included in the g-c-c shared module we must use the
version of the _ macro that includes the domain.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=618969
---
 src/empathy-account-assistant.c         | 3 ++-
 src/empathy-accounts-common.c           | 2 +-
 src/empathy-accounts-dialog.c           | 2 +-
 src/empathy-auto-salut-account-helper.c | 4 +++-
 src/empathy-import-dialog.c             | 2 +-
 src/empathy-import-mc4-accounts.c       | 4 +++-
 src/empathy-import-widget.c             | 4 +++-
 7 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 9cfea5ab5..796f56527 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -20,7 +20,8 @@
 
 /* empathy-account-assistant.c */
 
-#include <glib/gi18n.h>
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include <telepathy-glib/util.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 311a5f600..c6c18e834 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <unique/unique.h>
 
 #include <telepathy-glib/account-manager.h>
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 59bad4796..3d8aed9fd 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
 #include <telepathy-glib/account-manager.h>
diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c
index 37aedb325..0a96316f1 100644
--- a/src/empathy-auto-salut-account-helper.c
+++ b/src/empathy-auto-salut-account-helper.c
@@ -19,8 +19,10 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
+#include <config.h>
+
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 94c6fd765..e8b1ed87c 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <telepathy-glib/util.h>
 
diff --git a/src/empathy-import-mc4-accounts.c b/src/empathy-import-mc4-accounts.c
index b4bca6fdb..1d5fd674a 100644
--- a/src/empathy-import-mc4-accounts.c
+++ b/src/empathy-import-mc4-accounts.c
@@ -19,10 +19,12 @@
  * Authors: Arnaud Maillet <arnaud.maillet@collabora.co.uk>
  */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index a5bc0ef24..09898180a 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -22,6 +22,8 @@
 
 /* empathy-import-widget.c */
 
+#include <config.h>
+
 #include "empathy-import-dialog.h"
 #include "empathy-import-widget.h"
 #include "empathy-import-pidgin.h"
@@ -36,7 +38,7 @@
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT)
 
-- 
cgit v1.2.3