From 9eb639a11747acea600f1db0536c59074bcd1524 Mon Sep 17 00:00:00 2001
From: Ross Burton <rburton@src.gnome.org>
Date: Thu, 3 Feb 2005 16:35:03 +0000
Subject: [PATCH] Use glib/gi18n.h

---
 ChangeLog                                   |  9 +++++++++
 libedataserver/e-categories.c               |  2 +-
 libedataserver/e-component-listener.c       |  6 +++++-
 libedataserver/e-time-utils.c               |  2 +-
 libedataserverui/ChangeLog                  | 13 +++++++++++++
 libedataserverui/e-categories-dialog.c      |  2 +-
 libedataserverui/e-contact-store.c          |  2 +-
 libedataserverui/e-destination-store.c      |  2 +-
 libedataserverui/e-name-selector-dialog.c   |  2 +-
 libedataserverui/e-name-selector-entry.c    |  2 +-
 libedataserverui/e-name-selector-model.c    |  2 +-
 libedataserverui/e-name-selector.c          |  2 +-
 libedataserverui/e-source-selector-dialog.c |  2 +-
 libedataserverui/e-tree-model-generator.c   |  2 +-
 servers/groupwise/e-gw-connection.c         |  2 +-
 src/server.c                                |  2 +-
 16 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f91334..953b6da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-03  Ross Burton  <ross@burtonini.com>
+
+	* libedataserver/e-categories.c:
+	* libedataserver/e-component-listener.c:
+	* libedataserver/e-time-utils.c:
+	* servers/groupwise/e-gw-connection.c:
+	* src/server.c:
+	Use glib/gi18n.h.
+
 2005-02-03  Rodrigo Moya <rodrigo@novell.com>
 
 	* libedataserver/e-categories.c (idle_saver_cb): changed to return a
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index c7d4207..70ab9fa 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -23,7 +23,7 @@
 
 #include <libxml/parser.h>
 #include <glib/ghash.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
 #include "e-categories.h"
 
diff --git a/libedataserver/e-component-listener.c b/libedataserver/e-component-listener.c
index 1e7027f..4518fb8 100644
--- a/libedataserver/e-component-listener.c
+++ b/libedataserver/e-component-listener.c
@@ -8,10 +8,14 @@
  * Copyright 2002, Ximian, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-object.h>
 #include "e-component-listener.h"
-#include <libgnome/gnome-i18n.h>
 
 #define PARENT_TYPE GTK_TYPE_OBJECT
 
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index 4666b80..29c3712 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include "e-time-utils.h"
 #include "e-util.h"
 
diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog
index 40b0229..1c73833 100644
--- a/libedataserverui/ChangeLog
+++ b/libedataserverui/ChangeLog
@@ -1,3 +1,16 @@
+2005-02-03  Ross Burton  <ross@burtonini.com>
+
+	* libedataserverui/e-categories-dialog.c:
+	* libedataserverui/e-contact-store.c:
+	* libedataserverui/e-destination-store.c:
+	* libedataserverui/e-name-selector-dialog.c:
+	* libedataserverui/e-name-selector-entry.c:
+	* libedataserverui/e-name-selector-model.c:
+	* libedataserverui/e-name-selector.c:
+	* libedataserverui/e-source-selector-dialog.c:
+	* libedataserverui/e-tree-model-generator.c:
+	Use glib/gi18n.h.
+
 2005-01-27  Hao Sheng <hao.sheng@sun.com>
 
 	* e-name-selector-dialog.c:
diff --git a/libedataserverui/e-categories-dialog.c b/libedataserverui/e-categories-dialog.c
index f04b61d..6b61d0b 100644
--- a/libedataserverui/e-categories-dialog.c
+++ b/libedataserverui/e-categories-dialog.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkcellrenderertext.h>
diff --git a/libedataserverui/e-contact-store.c b/libedataserverui/e-contact-store.c
index b9c99da..d42581e 100644
--- a/libedataserverui/e-contact-store.c
+++ b/libedataserverui/e-contact-store.c
@@ -28,7 +28,7 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreednd.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include "e-contact-store.h"
 
 #define ITER_IS_VALID(contact_store, iter) ((iter)->stamp == (contact_store)->stamp)
diff --git a/libedataserverui/e-destination-store.c b/libedataserverui/e-destination-store.c
index e2714aa..3257cea 100644
--- a/libedataserverui/e-destination-store.c
+++ b/libedataserverui/e-destination-store.c
@@ -28,7 +28,7 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktreednd.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include "e-destination-store.h"
 
 #define ITER_IS_VALID(destination_store, iter) ((iter)->stamp == (destination_store)->stamp)
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index ca644e1..f7ec516 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -29,7 +29,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include <libedataserverui/e-destination-store.h>
 #include <libedataserverui/e-contact-store.h>
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index f6ae269..a29871c 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -29,7 +29,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkseparatormenuitem.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
diff --git a/libedataserverui/e-name-selector-model.c b/libedataserverui/e-name-selector-model.c
index 8f48775..f4323bf 100644
--- a/libedataserverui/e-name-selector-model.c
+++ b/libedataserverui/e-name-selector-model.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <libedataserver/e-data-server-marshal.h>
 #include "e-name-selector-model.h"
 
diff --git a/libedataserverui/e-name-selector.c b/libedataserverui/e-name-selector.c
index 361ccbe..c57a411 100644
--- a/libedataserverui/e-name-selector.c
+++ b/libedataserverui/e-name-selector.c
@@ -30,7 +30,7 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <libedataserverui/e-contact-store.h>
diff --git a/libedataserverui/e-source-selector-dialog.c b/libedataserverui/e-source-selector-dialog.c
index 3ccd4ca..05e0dbf 100644
--- a/libedataserverui/e-source-selector-dialog.c
+++ b/libedataserverui/e-source-selector-dialog.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glib-object.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
diff --git a/libedataserverui/e-tree-model-generator.c b/libedataserverui/e-tree-model-generator.c
index 239628a..cdea09d 100644
--- a/libedataserverui/e-tree-model-generator.c
+++ b/libedataserverui/e-tree-model-generator.c
@@ -25,9 +25,9 @@
 #endif
 
 #include <string.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
 #include "e-tree-model-generator.h"
 
 #define ETMG_DEBUG(x)
diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c
index e607182..56dc287 100644
--- a/servers/groupwise/e-gw-connection.c
+++ b/servers/groupwise/e-gw-connection.c
@@ -26,7 +26,7 @@
 #endif
 #include <string.h>
 #include <ctype.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n-lib.h>
 #include <libsoup/soup-session-sync.h>
 #include <libsoup/soup-soap-message.h>
 #include <libsoup/soup-misc.h>
diff --git a/src/server.c b/src/server.c
index b9edde3..5278491 100644
--- a/src/server.c
+++ b/src/server.c
@@ -34,11 +34,11 @@
 #include <pthread.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <libgnome/gnome-init.h>
 #include <bonobo-activation/bonobo-activation.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-i18n.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <gconf/gconf-client.h>
-- 
2.7.4