Re: [evolution-patches] Remove deprecated gnome-i18n

[Ross Burton <ross burtonini com>]

On Tue, 2005-02-01 at 17:20 -0600, Hans Petter Jansson wrote:
> Addressbook parts look ok.

Thanks.  Along with Rodrigo's OK I've committed the addressbook and
calendar parts.

I'm still looking for approval for the changes to libedataserver[ui]/,
src/ and server/ (attached).

Thanks,
Ross
-- 
Ross Burton                                 mail: ross burtonini com
                                          jabber: ross burtonini com
                                     www: http://www.burtonini.com./
 PGP Fingerprint: 1A21 F5B0 D8D0 CFE3 81D4 E25A 2D09 E447 D0B4 33DF

Index: libedataserver/e-categories.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-categories.c,v
retrieving revision 1.8
diff -u -r1.8 e-categories.c
--- libedataserver/e-categories.c	25 Jan 2005 12:27:35 -0000	1.8
+++ libedataserver/e-categories.c	26 Jan 2005 15:51:21 -0000
@@ -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"
 
Index: libedataserver/e-component-listener.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-component-listener.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 e-component-listener.c
--- libedataserver/e-component-listener.c	3 Nov 2003 18:23:55 -0000	1.1.1.1
+++ libedataserver/e-component-listener.c	26 Jan 2005 15:51:21 -0000
@@ -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
 
Index: libedataserver/e-time-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-time-utils.c,v
retrieving revision 1.2
diff -u -r1.2 e-time-utils.c
--- libedataserver/e-time-utils.c	3 Dec 2004 03:33:06 -0000	1.2
+++ libedataserver/e-time-utils.c	26 Jan 2005 15:51:21 -0000
@@ -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"
 
Index: libedataserverui/e-categories-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-categories-dialog.c,v
retrieving revision 1.10
diff -u -r1.10 e-categories-dialog.c
--- libedataserverui/e-categories-dialog.c	26 Jan 2005 12:39:44 -0000	1.10
+++ libedataserverui/e-categories-dialog.c	26 Jan 2005 15:51:21 -0000
@@ -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>
Index: libedataserverui/e-contact-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-contact-store.c,v
retrieving revision 1.6
diff -u -r1.6 e-contact-store.c
--- libedataserverui/e-contact-store.c	25 Jan 2005 02:21:19 -0000	1.6
+++ libedataserverui/e-contact-store.c	26 Jan 2005 15:51:22 -0000
@@ -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)
Index: libedataserverui/e-destination-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-destination-store.c,v
retrieving revision 1.3
diff -u -r1.3 e-destination-store.c
--- libedataserverui/e-destination-store.c	23 Dec 2004 02:06:41 -0000	1.3
+++ libedataserverui/e-destination-store.c	26 Jan 2005 15:51:22 -0000
@@ -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)
Index: libedataserverui/e-name-selector-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-dialog.c,v
retrieving revision 1.7
diff -u -r1.7 e-name-selector-dialog.c
--- libedataserverui/e-name-selector-dialog.c	25 Jan 2005 02:21:19 -0000	1.7
+++ libedataserverui/e-name-selector-dialog.c	26 Jan 2005 15:51:22 -0000
@@ -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>
Index: libedataserverui/e-name-selector-entry.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-entry.c,v
retrieving revision 1.13
diff -u -r1.13 e-name-selector-entry.c
--- libedataserverui/e-name-selector-entry.c	25 Jan 2005 02:56:01 -0000	1.13
+++ libedataserverui/e-name-selector-entry.c	26 Jan 2005 15:51:22 -0000
@@ -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>
Index: libedataserverui/e-name-selector-model.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-model.c,v
retrieving revision 1.4
diff -u -r1.4 e-name-selector-model.c
--- libedataserverui/e-name-selector-model.c	24 Jan 2005 20:06:55 -0000	1.4
+++ libedataserverui/e-name-selector-model.c	26 Jan 2005 15:51:22 -0000
@@ -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"
 
Index: libedataserverui/e-name-selector.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector.c,v
retrieving revision 1.2
diff -u -r1.2 e-name-selector.c
--- libedataserverui/e-name-selector.c	23 Dec 2004 02:06:41 -0000	1.2
+++ libedataserverui/e-name-selector.c	26 Jan 2005 15:51:22 -0000
@@ -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>
Index: libedataserverui/e-source-selector-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-source-selector-dialog.c,v
retrieving revision 1.1
diff -u -r1.1 e-source-selector-dialog.c
--- libedataserverui/e-source-selector-dialog.c	21 Oct 2004 16:07:03 -0000	1.1
+++ libedataserverui/e-source-selector-dialog.c	26 Jan 2005 15:51:22 -0000
@@ -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>
Index: libedataserverui/e-tree-model-generator.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-tree-model-generator.c,v
retrieving revision 1.1
diff -u -r1.1 e-tree-model-generator.c
--- libedataserverui/e-tree-model-generator.c	22 Jan 2005 09:59:42 -0000	1.1
+++ libedataserverui/e-tree-model-generator.c	26 Jan 2005 15:51:23 -0000
@@ -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)
Index: servers/groupwise/e-gw-connection.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.c,v
retrieving revision 1.99
diff -u -r1.99 e-gw-connection.c
--- servers/groupwise/e-gw-connection.c	25 Jan 2005 15:27:55 -0000	1.99
+++ servers/groupwise/e-gw-connection.c	26 Jan 2005 15:51:23 -0000
@@ -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>