Hi,
People may remember my attempts to remove libgnome from EDS (#69878), or
at least reduce its use. Well, I've found the time to work on this a
bit more, so attached is Stage 1 of my Two Week Plan, removing all use
of gnome-i18n.h and replacing it with glib/gi18n-lib.h.
gnome-i18n.h is a deprecated header and glib provides this functionality
now, so this is a trivial although long patch.
Please CC me on all replies as I am not subscribed to evolution-patches.
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: addressbook/backends/file/e-book-backend-file.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/file/e-book-backend-file.c,v retrieving revision 1.27 diff -u -r1.27 e-book-backend-file.c --- addressbook/backends/file/e-book-backend-file.c 13 Jan 2005 16:08:45 -0000 1.27 +++ addressbook/backends/file/e-book-backend-file.c 26 Jan 2005 15:51:12 -0000 @@ -37,7 +37,7 @@ #include "db.h" #include <sys/stat.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libedataserver/e-dbhash.h> #include <libedataserver/e-db3-utils.h> #include <libedataserver/e-util.h> Index: addressbook/backends/groupwise/e-book-backend-groupwise.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c,v retrieving revision 1.43 diff -u -r1.43 e-book-backend-groupwise.c --- addressbook/backends/groupwise/e-book-backend-groupwise.c 23 Jan 2005 09:21:09 -0000 1.43 +++ addressbook/backends/groupwise/e-book-backend-groupwise.c 26 Jan 2005 15:51:13 -0000 @@ -28,7 +28,7 @@ #include <libebook/e-contact.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libedataserver/e-sexp.h> #include <libedataserver/e-util.h> #include <libedataserver/e-url.h> @@ -40,7 +40,6 @@ #include <e-gw-connection.h> #include <e-gw-item.h> #include <e-gw-filter.h> -#include <libgnome/gnome-i18n.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> Index: addressbook/backends/ldap/e-book-backend-ldap.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/ldap/e-book-backend-ldap.c,v retrieving revision 1.38 diff -u -r1.38 e-book-backend-ldap.c --- addressbook/backends/ldap/e-book-backend-ldap.c 10 Jan 2005 12:12:43 -0000 1.38 +++ addressbook/backends/ldap/e-book-backend-ldap.c 26 Jan 2005 15:51:14 -0000 @@ -55,7 +55,7 @@ #include <sys/time.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libedataserver/e-sexp.h> #include <libebook/e-contact.h> Index: addressbook/backends/vcf/e-book-backend-vcf.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/vcf/e-book-backend-vcf.c,v retrieving revision 1.14 diff -u -r1.14 e-book-backend-vcf.c --- addressbook/backends/vcf/e-book-backend-vcf.c 10 Jan 2005 12:12:43 -0000 1.14 +++ addressbook/backends/vcf/e-book-backend-vcf.c 26 Jan 2005 15:51:14 -0000 @@ -33,7 +33,7 @@ #include <time.h> #include <sys/stat.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libebook/e-contact.h> #include <libedataserver/e-util.h> Index: addressbook/libebook/e-book.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-book.c,v retrieving revision 1.47 diff -u -r1.47 e-book.c --- addressbook/libebook/e-book.c 23 Dec 2004 17:33:49 -0000 1.47 +++ addressbook/libebook/e-book.c 26 Jan 2005 15:51:15 -0000 @@ -15,7 +15,7 @@ #include <bonobo/bonobo-main.h> #include <gconf/gconf-client.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libedataserver/e-component-listener.h> #include "e-book-marshal.h" Index: addressbook/libebook/e-contact.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-contact.c,v retrieving revision 1.39 diff -u -r1.39 e-contact.c --- addressbook/libebook/e-contact.c 8 Dec 2004 19:52:46 -0000 1.39 +++ addressbook/libebook/e-contact.c 26 Jan 2005 15:51:15 -0000 @@ -26,7 +26,7 @@ #include <stdio.h> #include <ctype.h> #include <string.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libgnomevfs/gnome-vfs-mime-utils.h> #include "e-contact.h" #include "e-book.h" Index: addressbook/libebook/e-destination.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/addressbook/libebook/e-destination.c,v retrieving revision 1.8 diff -u -r1.8 e-destination.c --- addressbook/libebook/e-destination.c 25 Jan 2005 02:16:24 -0000 1.8 +++ addressbook/libebook/e-destination.c 26 Jan 2005 15:51:15 -0000 @@ -44,7 +44,7 @@ #include <glib.h> #include <libxml/xmlmemory.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <camel/camel-internet-address.h> #define d(x) Index: calendar/backends/file/e-cal-backend-file.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/e-cal-backend-file.c,v retrieving revision 1.47 diff -u -r1.47 e-cal-backend-file.c --- calendar/backends/file/e-cal-backend-file.c 25 Jan 2005 16:34:38 -0000 1.47 +++ calendar/backends/file/e-cal-backend-file.c 26 Jan 2005 15:51:16 -0000 @@ -30,7 +30,7 @@ #include <fcntl.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-moniker-util.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libgnomevfs/gnome-vfs.h> #include <libedataserver/e-util.h> #include <libedataserver/e-xml-hash-utils.h> Index: calendar/backends/http/e-cal-backend-http.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/e-cal-backend-http.c,v retrieving revision 1.28 diff -u -r1.28 e-cal-backend-http.c --- calendar/backends/http/e-cal-backend-http.c 12 Jan 2005 14:24:20 -0000 1.28 +++ calendar/backends/http/e-cal-backend-http.c 26 Jan 2005 15:51:16 -0000 @@ -27,7 +27,7 @@ #include <gconf/gconf-client.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-moniker-util.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libedataserver/e-xml-hash-utils.h> #include <libecal/e-cal-recur.h> #include <libecal/e-cal-util.h> Index: calendar/backends/weather/e-cal-backend-weather.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/e-cal-backend-weather.c,v retrieving revision 1.4 diff -u -r1.4 e-cal-backend-weather.c --- calendar/backends/weather/e-cal-backend-weather.c 12 Jan 2005 07:18:47 -0000 1.4 +++ calendar/backends/weather/e-cal-backend-weather.c 26 Jan 2005 15:51:16 -0000 @@ -22,7 +22,7 @@ #include <libedata-cal/e-cal-backend-cache.h> #include <libedata-cal/e-cal-backend-util.h> #include <libedata-cal/e-cal-backend-sexp.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <string.h> #include "e-cal-backend-weather.h" #include "e-weather-source.h" Index: calendar/backends/weather/e-weather-source-ccf.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/e-weather-source-ccf.c,v retrieving revision 1.1 diff -u -r1.1 e-weather-source-ccf.c --- calendar/backends/weather/e-weather-source-ccf.c 7 Jan 2005 11:32:00 -0000 1.1 +++ calendar/backends/weather/e-weather-source-ccf.c 26 Jan 2005 15:51:17 -0000 @@ -19,9 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <string.h> #include <stdlib.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libxml/parser.h> #include <libxml/tree.h> #include "e-weather-source-ccf.h" Index: calendar/libecal/e-cal-component.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-component.c,v retrieving revision 1.12 diff -u -r1.12 e-cal-component.c --- calendar/libecal/e-cal-component.c 8 Jan 2005 07:16:42 -0000 1.12 +++ calendar/libecal/e-cal-component.c 26 Jan 2005 15:51:18 -0000 @@ -24,7 +24,7 @@ #include <stdlib.h> #include <unistd.h> #include <glib.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include "e-cal-component.h" #include "e-cal-time-util.h" Index: calendar/libecal/e-cal-recur.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-recur.c,v retrieving revision 1.4 diff -u -r1.4 e-cal-recur.c --- calendar/libecal/e-cal-recur.c 18 May 2004 14:42:48 -0000 1.4 +++ calendar/libecal/e-cal-recur.c 26 Jan 2005 15:51:19 -0000 @@ -27,7 +27,7 @@ #include <stdlib.h> #include <string.h> #include <glib.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include "e-cal-recur.h" #include "e-cal-time-util.h" Index: calendar/libecal/e-cal-util.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-util.c,v retrieving revision 1.7 diff -u -r1.7 e-cal-util.c --- calendar/libecal/e-cal-util.c 22 Dec 2004 11:56:55 -0000 1.7 +++ calendar/libecal/e-cal-util.c 26 Jan 2005 15:51:19 -0000 @@ -24,8 +24,7 @@ #include <string.h> #include <glib.h> #include <glib/gstrfuncs.h> -#include <libgnome/gnome-i18n.h> -#include <libgnome/gnome-util.h> +#include <glib/gi18n-lib.h> #include "e-cal-util.h" Index: calendar/libecal/e-cal.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal.c,v retrieving revision 1.88 diff -u -r1.88 e-cal.c --- calendar/libecal/e-cal.c 26 Jan 2005 05:06:21 -0000 1.88 +++ calendar/libecal/e-cal.c 26 Jan 2005 15:51:19 -0000 @@ -31,7 +31,6 @@ #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-i18n.h> #include <bonobo/bonobo-main.h> -#include <libgnome/gnome-util.h> #include <libedataserver/e-component-listener.h> #include <libedataserver/e-url.h> Index: calendar/libedata-cal/e-cal-backend-sexp.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/calendar/libedata-cal/e-cal-backend-sexp.c,v retrieving revision 1.19 diff -u -r1.19 e-cal-backend-sexp.c --- calendar/libedata-cal/e-cal-backend-sexp.c 8 Jan 2005 07:16:42 -0000 1.19 +++ calendar/libedata-cal/e-cal-backend-sexp.c 26 Jan 2005 15:51:20 -0000 @@ -18,8 +18,12 @@ * 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <string.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n-lib.h> #include <libedataserver/e-util.h> #include <libecal/e-cal-time-util.h> 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>
Attachment:
signature.asc
Description: This is a digitally signed message part