[empathy/gnome-2-30] Use library i18n method for source files included in shared library

[Rob Bradford <rbradford src gnome org>]

commit 9468f149790dae7efbc8f06fcf4cb80c135fac9d
Author: Rob Bradford <rob linux intel com>
Date:   Tue May 18 11:09:45 2010 +0100

    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(-)
---
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 9cfea5a..796f565 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 311a5f6..c6c18e8 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 b8c6d4a..f3e89d9 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 37aedb3..0a96316 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 94c6fd7..e8b1ed8 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 b4bca6f..1d5fd67 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 a5bc0ef..0989818 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)