[evolution-patches] [PATCH] Heavy Include Fixes
- From: Christian Neumair <chris gnome-de org>
- To: evolution-patches ximian com
- Subject: [evolution-patches] [PATCH] Heavy Include Fixes
- Date: Sat, 07 Feb 2004 13:50:41 +0100
This patch does a few things:
- add ifdef HAVE_CONFIG_H in a few places
- gnome-i18n.h/bonobo-i18n.h => gi18n.h conversion (glib 2.3 is required
anyway)
=> less gnome dependency
- remove some useless inclusions
I plan to do more heavy include cleanups.
regs,
Chris
Index: ./addressbook/gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.226
diff -u -r1.226 addressbook.c
--- ./addressbook/gui/component/addressbook.c 6 Feb 2004 23:03:22 -0000 1.226
+++ ./addressbook/gui/component/addressbook.c 7 Feb 2004 12:42:21 -0000
@@ -20,15 +20,17 @@
* Author: Chris Lahey (clahey ximian com)
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-href.h>
#include <libgnomeui/gnome-uidefs.h>
Index: ./addressbook/gui/component/addressbook-migrate.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-migrate.c,v
retrieving revision 1.14
diff -u -r1.14 addressbook-migrate.c
--- ./addressbook/gui/component/addressbook-migrate.c 7 Feb 2004 02:20:28 -0000 1.14
+++ ./addressbook/gui/component/addressbook-migrate.c 7 Feb 2004 12:42:21 -0000
@@ -19,11 +19,15 @@
* Author: Chris Toshok (toshok ximian com)
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <glib.h>
+#include <glib/gi18n.h>
#include <string.h>
#include "addressbook-migrate.h"
#include <libebook/e-book-async.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include <gal/util/e-xml-utils.h>
#include <gtk/gtkwidget.h>
Index: ./addressbook/gui/component/autocompletion-config.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/autocompletion-config.c,v
retrieving revision 1.2
diff -u -r1.2 autocompletion-config.c
--- ./addressbook/gui/component/autocompletion-config.c 17 Dec 2003 18:36:03 -0000 1.2
+++ ./addressbook/gui/component/autocompletion-config.c 7 Feb 2004 12:42:22 -0000
@@ -20,11 +20,6 @@
* Authors: Chris Toshok <toshok ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
#include "autocompletion-config.h"
#include "Evolution.h"
@@ -33,12 +28,10 @@
#include "e-source-selector.h"
#include <libedataserver/e-source-list.h>
-#include <libgnome/gnome-i18n.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtksignal.h>
-
typedef struct {
EvolutionConfigControl *config_control;
Index: ./addressbook/gui/component/addressbook-component.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-component.c,v
retrieving revision 1.110
diff -u -r1.110 addressbook-component.c
--- ./addressbook/gui/component/addressbook-component.c 29 Jan 2004 20:04:38 -0000 1.110
+++ ./addressbook/gui/component/addressbook-component.c 7 Feb 2004 12:42:22 -0000
@@ -22,8 +22,9 @@
/* EPFIXME: Add autocompletion setting. */
-
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "addressbook-component.h"
#include "addressbook-migrate.h"
@@ -37,7 +38,7 @@
#include "e-task-bar.h"
#include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkimage.h>
Index: ./addressbook/gui/component/addressbook-config.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-config.c,v
retrieving revision 1.67
diff -u -r1.67 addressbook-config.c
--- ./addressbook/gui/component/addressbook-config.c 3 Feb 2004 16:03:22 -0000 1.67
+++ ./addressbook/gui/component/addressbook-config.c 7 Feb 2004 12:42:22 -0000
@@ -7,17 +7,19 @@
/*#define STANDALONE*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <string.h>
#include <stdlib.h>
#include <sys/time.h>
+#include <glib/gi18n.h>
#include <gtk/gtkcombo.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page.h>
Index: ./addressbook/gui/component/select-names/e-select-names-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names-popup.c,v
retrieving revision 1.30
diff -u -r1.30 e-select-names-popup.c
--- ./addressbook/gui/component/select-names/e-select-names-popup.c 6 Jan 2004 18:38:11 -0000 1.30
+++ ./addressbook/gui/component/select-names/e-select-names-popup.c 7 Feb 2004 12:42:22 -0000
@@ -24,12 +24,15 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkimagemenuitem.h>
@@ -37,7 +40,6 @@
#include <gtk/gtkradiomenuitem.h>
#include <gtk/gtkseparatormenuitem.h>
#include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
#include <addressbook/util/eab-book-util.h>
#include <addressbook/gui/contact-editor/e-contact-editor.h>
Index: ./addressbook/gui/component/select-names/e-select-names-table-model.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names-table-model.c,v
retrieving revision 1.22
diff -u -r1.22 e-select-names-table-model.c
--- ./addressbook/gui/component/select-names/e-select-names-table-model.c 29 Jan 2004 01:27:34 -0000 1.22
+++ ./addressbook/gui/component/select-names/e-select-names-table-model.c 7 Feb 2004 12:42:23 -0000
@@ -6,14 +6,17 @@
* Copyright (C) 2000 Ximian, Inc.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
#include <libebook/e-contact.h>
#include "e-select-names-table-model.h"
Index: ./addressbook/gui/component/select-names/e-select-names-text-model.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names-text-model.c,v
retrieving revision 1.38
diff -u -r1.38 e-select-names-text-model.c
--- ./addressbook/gui/component/select-names/e-select-names-text-model.c 21 Oct 2003 18:48:39 -0000 1.38
+++ ./addressbook/gui/component/select-names/e-select-names-text-model.c 7 Feb 2004 12:42:23 -0000
@@ -7,15 +7,17 @@
* Copyright (C) 2000, 2001 Ximian, Inc.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <glib/gi18n.h>
#include <gal/e-text/e-text-model-repos.h>
-#include <libgnome/gnome-i18n.h>
#include <addressbook/gui/contact-editor/e-contact-editor.h>
#include "e-select-names-text-model.h"
Index: ./addressbook/gui/component/select-names/e-select-names.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names.c,v
retrieving revision 1.126
diff -u -r1.126 e-select-names.c
--- ./addressbook/gui/component/select-names/e-select-names.c 24 Jan 2004 21:47:50 -0000 1.126
+++ ./addressbook/gui/component/select-names/e-select-names.c 7 Feb 2004 12:42:23 -0000
@@ -18,11 +18,14 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/e-table/e-table-simple.h>
#include <gal/e-table/e-table-without.h>
Index: ./addressbook/gui/component/select-names/e-select-names-manager.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names-manager.c,v
retrieving revision 1.63
diff -u -r1.63 e-select-names-manager.c
--- ./addressbook/gui/component/select-names/e-select-names-manager.c 6 Dec 2003 23:19:01 -0000 1.63
+++ ./addressbook/gui/component/select-names/e-select-names-manager.c 7 Feb 2004 12:42:24 -0000
@@ -7,15 +7,12 @@
* Copyright (C) 2000, 2001 Ximian, Inc.
*/
-#include <config.h>
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <gal/e-text/e-entry.h>
-#include <libgnome/gnome-i18n.h>
#include "e-select-names-config.h"
#include "e-select-names-manager.h"
#include "e-select-names-marshal.h"
Index: ./addressbook/gui/contact-editor/e-contact-editor-address.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor-address.c,v
retrieving revision 1.29
diff -u -r1.29 e-contact-editor-address.c
--- ./addressbook/gui/contact-editor/e-contact-editor-address.c 6 Jan 2004 19:15:50 -0000 1.29
+++ ./addressbook/gui/contact-editor/e-contact-editor-address.c 7 Feb 2004 12:42:24 -0000
@@ -19,12 +19,14 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <e-contact-editor-address.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-window-icon.h>
#include <libgnome/gnome-util.h>
#include <gal/widgets/e-gui-utils.h>
Index: ./addressbook/gui/contact-editor/e-contact-editor-fullname.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor-fullname.c,v
retrieving revision 1.26
diff -u -r1.26 e-contact-editor-fullname.c
--- ./addressbook/gui/contact-editor/e-contact-editor-fullname.c 27 Jan 2004 21:47:15 -0000 1.26
+++ ./addressbook/gui/contact-editor/e-contact-editor-fullname.c 7 Feb 2004 12:42:24 -0000
@@ -19,11 +19,14 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include "e-contact-editor-fullname.h"
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-window-icon.h>
#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
#include <gtk/gtkcombo.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkentry.h>
Index: ./addressbook/gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.165
diff -u -r1.165 e-contact-editor.c
--- ./addressbook/gui/contact-editor/e-contact-editor.c 30 Jan 2004 22:52:38 -0000 1.165
+++ ./addressbook/gui/contact-editor/e-contact-editor.c 7 Feb 2004 12:42:26 -0000
@@ -19,12 +19,15 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-contact-editor.h"
#include <string.h>
#include <time.h>
+#include <glib/gi18n.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkcombo.h>
@@ -36,7 +39,6 @@
#include <libgnomeui/gnome-popup-menu.h>
#include <libgnomeui/gnome-window-icon.h>
#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-ui-container.h>
#include <bonobo/bonobo-ui-util.h>
Index: ./addressbook/gui/contact-editor/e-contact-editor-im.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor-im.c,v
retrieving revision 1.1
diff -u -r1.1 e-contact-editor-im.c
--- ./addressbook/gui/contact-editor/e-contact-editor-im.c 12 Jan 2004 03:35:22 -0000 1.1
+++ ./addressbook/gui/contact-editor/e-contact-editor-im.c 7 Feb 2004 12:42:26 -0000
@@ -19,11 +19,15 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include "e-contact-editor-im.h"
+
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-window-icon.h>
#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkhbox.h>
Index: ./addressbook/gui/contact-editor/e-contact-quick-add.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-quick-add.c,v
retrieving revision 1.34
diff -u -r1.34 e-contact-quick-add.c
--- ./addressbook/gui/contact-editor/e-contact-quick-add.c 7 Nov 2003 05:51:33 -0000 1.34
+++ ./addressbook/gui/contact-editor/e-contact-quick-add.c 7 Feb 2004 12:42:26 -0000
@@ -24,16 +24,19 @@
* USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <ctype.h>
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkentry.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktable.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-app.h>
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
Index: ./addressbook/gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.48
diff -u -r1.48 e-contact-list-editor.c
--- ./addressbook/gui/contact-list-editor/e-contact-list-editor.c 30 Jan 2004 22:52:39 -0000 1.48
+++ ./addressbook/gui/contact-list-editor/e-contact-list-editor.c 7 Feb 2004 12:42:27 -0000
@@ -18,13 +18,15 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-contact-list-editor.h"
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-window-icon.h>
#include <bonobo/bonobo-ui-container.h>
#include <bonobo/bonobo-ui-util.h>
Index: ./addressbook/gui/search/e-addressbook-search-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/search/e-addressbook-search-dialog.c,v
retrieving revision 1.29
diff -u -r1.29 e-addressbook-search-dialog.c
--- ./addressbook/gui/search/e-addressbook-search-dialog.c 21 Oct 2003 18:48:53 -0000 1.29
+++ ./addressbook/gui/search/e-addressbook-search-dialog.c 7 Feb 2004 12:42:27 -0000
@@ -19,12 +19,14 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+#include <glib/gi18n.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
#include "gal/util/e-util.h"
#include "e-addressbook-search-dialog.h"
Index: ./addressbook/gui/widgets/e-addressbook-reflow-adapter.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-reflow-adapter.c,v
retrieving revision 1.30
diff -u -r1.30 e-addressbook-reflow-adapter.c
--- ./addressbook/gui/widgets/e-addressbook-reflow-adapter.c 21 Oct 2003 18:48:55 -0000 1.30
+++ ./addressbook/gui/widgets/e-addressbook-reflow-adapter.c 7 Feb 2004 12:42:27 -0000
@@ -1,10 +1,13 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
+#include <glib/gi18n.h>
-#include <libgnome/gnome-i18n.h>
#include "eab-marshal.h"
#include "e-addressbook-reflow-adapter.h"
#include "e-addressbook-model.h"
Index: ./addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.128
diff -u -r1.128 e-addressbook-view.c
--- ./addressbook/gui/widgets/e-addressbook-view.c 6 Feb 2004 23:03:23 -0000 1.128
+++ ./addressbook/gui/widgets/e-addressbook-view.c 7 Feb 2004 12:42:28 -0000
@@ -20,11 +20,13 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <gtk/gtkscrolledwindow.h>
#include <gal/e-table/e-table-scrolled.h>
Index: ./addressbook/gui/widgets/e-minicard-label.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard-label.c,v
retrieving revision 1.38
diff -u -r1.38 e-minicard-label.c
--- ./addressbook/gui/widgets/e-minicard-label.c 14 Nov 2003 00:38:47 -0000 1.38
+++ ./addressbook/gui/widgets/e-minicard-label.c 7 Feb 2004 12:42:28 -0000
@@ -19,14 +19,16 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-minicard-label.h"
#include "eab-marshal.h"
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include <gal/e-text/e-text.h>
#include <gal/widgets/e-canvas.h>
Index: ./addressbook/gui/widgets/e-minicard-view-widget.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard-view-widget.c,v
retrieving revision 1.31
diff -u -r1.31 e-minicard-view-widget.c
--- ./addressbook/gui/widgets/e-minicard-view-widget.c 21 Oct 2003 18:48:56 -0000 1.31
+++ ./addressbook/gui/widgets/e-minicard-view-widget.c 7 Feb 2004 12:42:28 -0000
@@ -19,12 +19,14 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gal/widgets/e-canvas-background.h>
#include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-i18n.h>
#include "eab-marshal.h"
#include "e-minicard-view-widget.h"
Index: ./addressbook/gui/widgets/e-minicard-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard-view.c,v
retrieving revision 1.62
diff -u -r1.62 e-minicard-view.c
--- ./addressbook/gui/widgets/e-minicard-view.c 21 Oct 2003 18:48:56 -0000 1.62
+++ ./addressbook/gui/widgets/e-minicard-view.c 7 Feb 2004 12:42:28 -0000
@@ -19,7 +19,9 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-minicard-view.h"
@@ -27,10 +29,10 @@
#include "eab-marshal.h"
#include "util/eab-book-util.h"
+#include <glib/gi18n.h>
#include <gtk/gtkselection.h>
#include <gtk/gtkdnd.h>
#include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-i18n.h>
#include <string.h>
static void e_minicard_view_drag_data_get(GtkWidget *widget,
Index: ./addressbook/gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.110
diff -u -r1.110 e-minicard.c
--- ./addressbook/gui/widgets/e-minicard.c 14 Nov 2003 00:38:47 -0000 1.110
+++ ./addressbook/gui/widgets/e-minicard.c 7 Feb 2004 12:42:29 -0000
@@ -19,13 +19,16 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtkmain.h>
#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <gal/e-text/e-text.h>
Index: ./addressbook/gui/widgets/eab-contact-display.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-contact-display.c,v
retrieving revision 1.3
diff -u -r1.3 eab-contact-display.c
--- ./addressbook/gui/widgets/eab-contact-display.c 3 Feb 2004 18:22:46 -0000 1.3
+++ ./addressbook/gui/widgets/eab-contact-display.c 7 Feb 2004 12:42:29 -0000
@@ -20,13 +20,17 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "eab-contact-display.h"
#include "e-util/e-html-utils.h"
#include "util/eab-destination.h"
#include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnome/gnome-url.h>
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-stream.h>
Index: ./addressbook/gui/widgets/gal-view-factory-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/gal-view-factory-minicard.c,v
retrieving revision 1.6
diff -u -r1.6 gal-view-factory-minicard.c
--- ./addressbook/gui/widgets/gal-view-factory-minicard.c 9 Jan 2003 22:09:54 -0000 1.6
+++ ./addressbook/gui/widgets/gal-view-factory-minicard.c 7 Feb 2004 12:42:29 -0000
@@ -7,9 +7,13 @@
*
* (C) 2000, 2001 Ximian, Inc.
*/
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "gal-view-factory-minicard.h"
#include "gal-view-minicard.h"
#include "gal/util/e-util.h"
Index: ./addressbook/gui/widgets/gal-view-factory-treeview.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/gal-view-factory-treeview.c,v
retrieving revision 1.1
diff -u -r1.1 gal-view-factory-treeview.c
--- ./addressbook/gui/widgets/gal-view-factory-treeview.c 9 Jan 2003 02:31:46 -0000 1.1
+++ ./addressbook/gui/widgets/gal-view-factory-treeview.c 7 Feb 2004 12:42:29 -0000
@@ -8,9 +8,14 @@
*
* (C) 2000, 2001 Ximian, Inc.
*/
+
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include "gal-view-factory-treeview.h"
#include "gal-view-treeview.h"
Index: ./addressbook/printing/e-contact-print-envelope.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/printing/e-contact-print-envelope.c,v
retrieving revision 1.17
diff -u -r1.17 e-contact-print-envelope.c
--- ./addressbook/printing/e-contact-print-envelope.c 21 Oct 2003 18:49:02 -0000 1.17
+++ ./addressbook/printing/e-contact-print-envelope.c 7 Feb 2004 12:42:30 -0000
@@ -19,10 +19,13 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include "addressbook/printing/e-contact-print-envelope.h"
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <time.h>
#include <libgnomeprintui/gnome-print-dialog.h>
Index: ./addressbook/printing/e-contact-print.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/printing/e-contact-print.c,v
retrieving revision 1.43
diff -u -r1.43 e-contact-print.c
--- ./addressbook/printing/e-contact-print.c 20 Jan 2004 16:17:18 -0000 1.43
+++ ./addressbook/printing/e-contact-print.c 7 Feb 2004 12:42:30 -0000
@@ -19,7 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include "e-contact-print.h"
#include <ctype.h>
@@ -27,11 +30,11 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-font.h>
Index: ./calendar/gui/cal-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/cal-search-bar.c,v
retrieving revision 1.20
diff -u -r1.20 cal-search-bar.c
--- ./calendar/gui/cal-search-bar.c 20 Nov 2003 15:11:37 -0000 1.20
+++ ./calendar/gui/cal-search-bar.c 7 Feb 2004 12:42:30 -0000
@@ -25,11 +25,11 @@
#include <stdlib.h>
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include "cal-search-bar.h"
Index: ./calendar/gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.235
diff -u -r1.235 e-day-view.c
--- ./calendar/gui/e-day-view.c 6 Feb 2004 03:03:42 -0000 1.235
+++ ./calendar/gui/e-day-view.c 7 Feb 2004 12:42:33 -0000
@@ -26,13 +26,16 @@
* EDayView - displays the Day & Work-Week views of the calendar.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-day-view.h"
#include "ea-calendar.h"
#include <math.h>
#include <time.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#include <gtk/gtkdnd.h>
@@ -47,7 +50,6 @@
#include <gal/widgets/e-unicode.h>
#include <gal/util/e-util.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-util.h>
#include <e-util/e-categories-config.h>
Index: ./calendar/gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.144
diff -u -r1.144 calendar-commands.c
--- ./calendar/gui/calendar-commands.c 17 Jan 2004 21:06:13 -0000 1.144
+++ ./calendar/gui/calendar-commands.c 7 Feb 2004 12:42:33 -0000
@@ -24,7 +24,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <pwd.h>
#include <unistd.h>
#include <sys/types.h>
@@ -33,6 +36,7 @@
#include <ctype.h>
#include <errno.h>
+#include <glib/gi18n.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkfilesel.h>
#include <gtk/gtklabel.h>
@@ -45,7 +49,6 @@
#include <libgnomeui/gnome-messagebox.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-exception.h>
#include <gal/util/e-util.h>
Index: ./calendar/gui/e-itip-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-itip-control.c,v
retrieving revision 1.140
diff -u -r1.140 e-itip-control.c
--- ./calendar/gui/e-itip-control.c 6 Feb 2004 03:03:42 -0000 1.140
+++ ./calendar/gui/e-itip-control.c 7 Feb 2004 12:42:34 -0000
@@ -30,8 +30,8 @@
#include <fcntl.h>
#include <unistd.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmisc.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
Index: ./calendar/gui/calendar-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-component.c,v
retrieving revision 1.147
diff -u -r1.147 calendar-component.c
--- ./calendar/gui/calendar-component.c 4 Feb 2004 12:36:08 -0000 1.147
+++ ./calendar/gui/calendar-component.c 7 Feb 2004 12:42:34 -0000
@@ -27,8 +27,8 @@
#include <string.h>
#include <errno.h>
+#include <glib/gi18n.h>
#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
#include <bonobo/bonobo-exception.h>
#include "e-pub-utils.h"
#include "e-cal-view.h"
Index: ./calendar/gui/e-meeting-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-list-view.c,v
retrieving revision 1.6
diff -u -r1.6 e-meeting-list-view.c
--- ./calendar/gui/e-meeting-list-view.c 24 Dec 2003 17:39:03 -0000 1.6
+++ ./calendar/gui/e-meeting-list-view.c 7 Feb 2004 12:42:35 -0000
@@ -27,11 +27,11 @@
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtktreemodel.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-exception.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libebook/e-book.h>
Index: ./calendar/gui/calendar-offline-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-offline-handler.c,v
retrieving revision 1.22
diff -u -r1.22 calendar-offline-handler.c
--- ./calendar/gui/calendar-offline-handler.c 22 Dec 2003 15:57:21 -0000 1.22
+++ ./calendar/gui/calendar-offline-handler.c 7 Feb 2004 12:42:35 -0000
@@ -26,10 +26,10 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
#include <gal/util/e-util.h>
#include "e-util/e-url.h"
#include <libecal/e-cal.h>
Index: ./calendar/gui/calendar-view-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-view-factory.c,v
retrieving revision 1.6
diff -u -r1.6 calendar-view-factory.c
--- ./calendar/gui/calendar-view-factory.c 10 Oct 2003 05:29:35 -0000 1.6
+++ ./calendar/gui/calendar-view-factory.c 7 Feb 2004 12:42:35 -0000
@@ -23,7 +23,7 @@
#endif
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "calendar-view-factory.h"
#include "calendar-view.h"
Index: ./calendar/gui/e-meeting-store.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.c,v
retrieving revision 1.6
diff -u -r1.6 e-meeting-store.c
--- ./calendar/gui/e-meeting-store.c 6 Feb 2004 03:03:43 -0000 1.6
+++ ./calendar/gui/e-meeting-store.c 7 Feb 2004 12:42:35 -0000
@@ -26,7 +26,7 @@
#endif
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libebook/e-book.h>
Index: ./calendar/gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.54
diff -u -r1.54 e-meeting-time-sel.c
--- ./calendar/gui/e-meeting-time-sel.c 21 Oct 2003 18:49:23 -0000 1.54
+++ ./calendar/gui/e-meeting-time-sel.c 7 Feb 2004 12:42:36 -0000
@@ -32,6 +32,7 @@
#include <string.h>
#include <time.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtkarrow.h>
@@ -49,7 +50,6 @@
#include <gtk/gtkvbox.h>
#include <gtk/gtkvscrollbar.h>
#include <libgnomeui/gnome-dateedit.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomecanvas/gnome-canvas-widget.h>
#include <gal/widgets/e-canvas.h>
Index: ./calendar/gui/comp-editor-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/comp-editor-factory.c,v
retrieving revision 1.35
diff -u -r1.35 comp-editor-factory.c
--- ./calendar/gui/comp-editor-factory.c 6 Feb 2004 03:03:41 -0000 1.35
+++ ./calendar/gui/comp-editor-factory.c 7 Feb 2004 12:42:37 -0000
@@ -22,9 +22,9 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-i18n.h>
#include <evolution-calendar.h>
#include <e-util/e-url.h>
#include <libecal/e-cal.h>
Index: ./calendar/gui/e-alarm-list.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-alarm-list.c,v
retrieving revision 1.7
diff -u -r1.7 e-alarm-list.c
--- ./calendar/gui/e-alarm-list.c 6 Feb 2004 03:03:41 -0000 1.7
+++ ./calendar/gui/e-alarm-list.c 7 Feb 2004 12:42:37 -0000
@@ -20,13 +20,16 @@
* Authors: Hans Petter Jansson <hpj ximian com>
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktreednd.h>
-#include <libgnome/gnome-i18n.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <libecal/e-cal-time-util.h>
#include <e-util/e-time-utils.h>
#include "calendar-config.h"
Index: ./calendar/gui/e-cal-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-list-view.c,v
retrieving revision 1.7
diff -u -r1.7 e-cal-list-view.c
--- ./calendar/gui/e-cal-list-view.c 28 Jan 2004 22:54:36 -0000 1.7
+++ ./calendar/gui/e-cal-list-view.c 7 Feb 2004 12:42:37 -0000
@@ -25,7 +25,9 @@
* ECalListView - display calendar events in an ETable.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-cal-list-view.h"
#include "ea-calendar.h"
@@ -33,6 +35,7 @@
#include <math.h>
#include <time.h>
#include <sys/stat.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#include <gtk/gtkdnd.h>
@@ -49,7 +52,6 @@
#include <gal/e-table/e-cell-combo.h>
#include <gal/widgets/e-popup-menu.h>
#include <widgets/misc/e-cell-date-edit.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-util.h>
#include <e-util/e-categories-config.h>
Index: ./calendar/gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.198
diff -u -r1.198 e-week-view.c
--- ./calendar/gui/e-week-view.c 15 Jan 2004 13:46:47 -0000 1.198
+++ ./calendar/gui/e-week-view.c 7 Feb 2004 12:42:39 -0000
@@ -27,19 +27,21 @@
* EWeekView - displays the Week & Month views of the calendar.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-week-view.h"
#include "ea-calendar.h"
#include <math.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkselection.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkvscrollbar.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-util.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
Index: ./calendar/gui/e-cal-model-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-calendar.c,v
retrieving revision 1.9
diff -u -r1.9 e-cal-model-calendar.c
--- ./calendar/gui/e-cal-model-calendar.c 19 Nov 2003 16:17:37 -0000 1.9
+++ ./calendar/gui/e-cal-model-calendar.c 7 Feb 2004 12:42:39 -0000
@@ -19,9 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include "e-cal-model-calendar.h"
#include "e-cell-date-edit-text.h"
Index: ./calendar/gui/gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.301
diff -u -r1.301 gnome-cal.c
--- ./calendar/gui/gnome-cal.c 6 Feb 2004 03:03:43 -0000 1.301
+++ ./calendar/gui/gnome-cal.c 7 Feb 2004 12:42:40 -0000
@@ -25,15 +25,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <unistd.h>
#include <signal.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkbindings.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
Index: ./calendar/gui/e-cal-model-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-tasks.c,v
retrieving revision 1.15
diff -u -r1.15 e-cal-model-tasks.c
--- ./calendar/gui/e-cal-model-tasks.c 24 Jan 2004 21:29:13 -0000 1.15
+++ ./calendar/gui/e-cal-model-tasks.c 7 Feb 2004 12:42:40 -0000
@@ -19,10 +19,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <math.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include "calendar-config.h"
#include "e-cal-model-tasks.h"
Index: ./calendar/gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.18
diff -u -r1.18 e-cal-model.c
--- ./calendar/gui/e-cal-model.c 22 Jan 2004 15:45:08 -0000 1.18
+++ ./calendar/gui/e-cal-model.c 7 Feb 2004 12:42:41 -0000
@@ -18,10 +18,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
+#include <glib/gi18n.h>
#include <glib/garray.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include <e-util/e-config-listener.h>
#include <e-util/e-time-utils.h>
Index: ./calendar/gui/e-cal-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-view.c,v
retrieving revision 1.34
diff -u -r1.34 e-cal-view.c
--- ./calendar/gui/e-cal-view.c 6 Feb 2004 03:03:41 -0000 1.34
+++ ./calendar/gui/e-cal-view.c 7 Feb 2004 12:42:41 -0000
@@ -21,14 +21,17 @@
* USA
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
#include <time.h>
+#include <glib/gi18n.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkstock.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkbindings.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include "e-util/e-dialog-utils.h"
#include "e-calendar-marshal.h"
Index: ./calendar/gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.86
diff -u -r1.86 itip-utils.c
--- ./calendar/gui/itip-utils.c 6 Feb 2004 03:03:44 -0000 1.86
+++ ./calendar/gui/itip-utils.c 7 Feb 2004 12:42:42 -0000
@@ -24,10 +24,10 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-moniker-util.h>
-#include <libgnome/gnome-i18n.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkwidget.h>
#include <gal/util/e-util.h>
Index: ./calendar/gui/main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/main.c,v
retrieving revision 1.164
diff -u -r1.164 main.c
--- ./calendar/gui/main.c 4 Feb 2004 11:54:58 -0000 1.164
+++ ./calendar/gui/main.c 7 Feb 2004 12:42:42 -0000
@@ -20,15 +20,7 @@
* Author: Ettore Perazzoli
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-init.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-shlib-factory.h>
Index: ./calendar/gui/migration.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/migration.c,v
retrieving revision 1.14
diff -u -r1.14 migration.c
--- ./calendar/gui/migration.c 29 Jan 2004 16:31:13 -0000 1.14
+++ ./calendar/gui/migration.c 7 Feb 2004 12:42:42 -0000
@@ -20,8 +20,12 @@
* Author: Rodrigo Moya <rodrigo ximian com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-xfer.h>
#include <gtk/gtkwidget.h>
Index: ./calendar/gui/print.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/print.c,v
retrieving revision 1.65
diff -u -r1.65 print.c
--- ./calendar/gui/print.c 6 Feb 2004 03:03:44 -0000 1.65
+++ ./calendar/gui/print.c 7 Feb 2004 12:42:43 -0000
@@ -22,15 +22,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <sys/stat.h>
#include <sys/time.h>
#include <math.h>
#include <string.h>
#include <time.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkradiobutton.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomeui/gnome-stock-icons.h>
Index: ./calendar/gui/e-cell-date-edit-text.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cell-date-edit-text.c,v
retrieving revision 1.12
diff -u -r1.12 e-cell-date-edit-text.c
--- ./calendar/gui/e-cell-date-edit-text.c 20 Nov 2003 15:11:37 -0000 1.12
+++ ./calendar/gui/e-cell-date-edit-text.c 7 Feb 2004 12:42:44 -0000
@@ -26,15 +26,17 @@
* representation of the date, from a ECalComponentDateTime* model value.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <sys/time.h>
#include <time.h>
#include <unistd.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-messagebox.h>
#include <libgnomeui/gnome-stock-icons.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include <e-util/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
Index: ./calendar/gui/tasks-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-component.c,v
retrieving revision 1.55
diff -u -r1.55 tasks-component.c
--- ./calendar/gui/tasks-component.c 30 Jan 2004 07:48:24 -0000 1.55
+++ ./calendar/gui/tasks-component.c 7 Feb 2004 12:42:44 -0000
@@ -26,8 +26,8 @@
#include <errno.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
#include <bonobo/bonobo-exception.h>
#include <gconf/gconf-client.h>
#include <libecal/e-cal.h>
Index: ./calendar/gui/tasks-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-control.c,v
retrieving revision 1.75
diff -u -r1.75 tasks-control.c
--- ./calendar/gui/tasks-control.c 21 Jan 2004 17:55:44 -0000 1.75
+++ ./calendar/gui/tasks-control.c 7 Feb 2004 12:42:44 -0000
@@ -21,12 +21,15 @@
* Ettore Perazzoli
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
Index: ./calendar/gui/weekday-picker.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/weekday-picker.c,v
retrieving revision 1.18
diff -u -r1.18 weekday-picker.c
--- ./calendar/gui/weekday-picker.c 10 Dec 2003 02:52:13 -0000 1.18
+++ ./calendar/gui/weekday-picker.c 7 Feb 2004 12:42:44 -0000
@@ -23,9 +23,9 @@
#endif
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <libgnomecanvas/gnome-canvas-text.h>
#include <gal/util/e-util.h>
Index: ./calendar/gui/e-day-view-time-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-time-item.c,v
retrieving revision 1.28
diff -u -r1.28 e-day-view-time-item.c
--- ./calendar/gui/e-day-view-time-item.c 7 Nov 2003 05:51:59 -0000 1.28
+++ ./calendar/gui/e-day-view-time-item.c 7 Feb 2004 12:42:45 -0000
@@ -30,10 +30,10 @@
#include <config.h>
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkradiomenuitem.h>
#include <gtk/gtkcheckmenuitem.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/widgets/e-gui-utils.h>
#include "e-day-view-time-item.h"
#include "calendar-config.h"
Index: ./calendar/gui/e-day-view-top-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-top-item.c,v
retrieving revision 1.39
diff -u -r1.39 e-day-view-top-item.c
--- ./calendar/gui/e-day-view-top-item.c 7 Nov 2003 05:51:59 -0000 1.39
+++ ./calendar/gui/e-day-view-top-item.c 7 Feb 2004 12:42:45 -0000
@@ -25,9 +25,12 @@
* EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include "e-util/e-categories-config.h"
#include <libecal/e-cal-time-util.h>
Index: ./calendar/gui/e-meeting-time-sel-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel-item.c,v
retrieving revision 1.14
diff -u -r1.14 e-meeting-time-sel-item.c
--- ./calendar/gui/e-meeting-time-sel-item.c 30 Sep 2003 22:39:02 -0000 1.14
+++ ./calendar/gui/e-meeting-time-sel-item.c 7 Feb 2004 12:42:45 -0000
@@ -34,7 +34,7 @@
#include <time.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "calendar-config.h"
#include "e-meeting-time-sel-item.h"
#include "e-meeting-time-sel.h"
Index: ./calendar/gui/e-week-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-main-item.c,v
retrieving revision 1.20
diff -u -r1.20 e-week-view-main-item.c
--- ./calendar/gui/e-week-view-main-item.c 11 Dec 2003 01:48:25 -0000 1.20
+++ ./calendar/gui/e-week-view-main-item.c 7 Feb 2004 12:42:46 -0000
@@ -26,10 +26,12 @@
* Month calendar views.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "e-week-view-main-item.h"
#include "ea-calendar.h"
Index: ./calendar/gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.55
diff -u -r1.55 task-page.c
--- ./calendar/gui/dialogs/task-page.c 6 Feb 2004 03:03:46 -0000 1.55
+++ ./calendar/gui/dialogs/task-page.c 7 Feb 2004 12:42:47 -0000
@@ -26,13 +26,13 @@
#endif
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktextview.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include <gal/widgets/e-categories.h>
#include <widgets/misc/e-dateedit.h>
Index: ./calendar/gui/dialogs/alarm-options.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-options.c,v
retrieving revision 1.22
diff -u -r1.22 alarm-options.c
--- ./calendar/gui/dialogs/alarm-options.c 1 Dec 2003 22:14:25 -0000 1.22
+++ ./calendar/gui/dialogs/alarm-options.c 7 Feb 2004 12:42:47 -0000
@@ -24,7 +24,7 @@
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkdialog.h>
Index: ./calendar/gui/dialogs/cancel-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cancel-comp.c,v
retrieving revision 1.11
diff -u -r1.11 cancel-comp.c
--- ./calendar/gui/dialogs/cancel-comp.c 12 Jan 2004 21:19:09 -0000 1.11
+++ ./calendar/gui/dialogs/cancel-comp.c 7 Feb 2004 12:42:47 -0000
@@ -23,8 +23,8 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include "cancel-comp.h"
Index: ./calendar/gui/dialogs/changed-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/changed-comp.c,v
retrieving revision 1.8
diff -u -r1.8 changed-comp.c
--- ./calendar/gui/dialogs/changed-comp.c 12 Jan 2004 21:19:09 -0000 1.8
+++ ./calendar/gui/dialogs/changed-comp.c 7 Feb 2004 12:42:47 -0000
@@ -23,8 +23,8 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include "changed-comp.h"
Index: ./calendar/gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.92
diff -u -r1.92 comp-editor.c
--- ./calendar/gui/dialogs/comp-editor.c 16 Jan 2004 16:29:21 -0000 1.92
+++ ./calendar/gui/dialogs/comp-editor.c 7 Feb 2004 12:42:48 -0000
@@ -27,9 +27,9 @@
#include <sys/stat.h>
#include <unistd.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
Index: ./calendar/gui/dialogs/comp-editor-util.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor-util.c,v
retrieving revision 1.33
diff -u -r1.33 comp-editor-util.c
--- ./calendar/gui/dialogs/comp-editor-util.c 6 Feb 2004 03:03:45 -0000 1.33
+++ ./calendar/gui/dialogs/comp-editor-util.c 7 Feb 2004 12:42:48 -0000
@@ -26,8 +26,8 @@
#include <string.h>
#include <libical/ical.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-widget.h>
Index: ./calendar/gui/dialogs/alarm-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-page.c,v
retrieving revision 1.39
diff -u -r1.39 alarm-page.c
--- ./calendar/gui/dialogs/alarm-page.c 5 Dec 2003 09:38:44 -0000 1.39
+++ ./calendar/gui/dialogs/alarm-page.c 7 Feb 2004 12:42:48 -0000
@@ -29,13 +29,13 @@
#endif
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkoptionmenu.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include "e-util/e-dialog-widgets.h"
#include "e-util/e-time-utils.h"
Index: ./calendar/gui/dialogs/event-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-editor.c,v
retrieving revision 1.39
diff -u -r1.39 event-editor.c
--- ./calendar/gui/dialogs/event-editor.c 20 Nov 2003 15:11:40 -0000 1.39
+++ ./calendar/gui/dialogs/event-editor.c 7 Feb 2004 12:42:49 -0000
@@ -23,12 +23,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
+#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <widgets/misc/e-dateedit.h>
#include "event-page.h"
#include "alarm-page.h"
Index: ./calendar/gui/dialogs/comp-editor-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor-page.c,v
retrieving revision 1.19
diff -u -r1.19 comp-editor-page.c
--- ./calendar/gui/dialogs/comp-editor-page.c 18 Dec 2003 02:41:52 -0000 1.19
+++ ./calendar/gui/dialogs/comp-editor-page.c 7 Feb 2004 12:42:49 -0000
@@ -22,8 +22,8 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
#include "comp-editor-page.h"
Index: ./calendar/gui/dialogs/delete-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/delete-comp.c,v
retrieving revision 1.21
diff -u -r1.21 delete-comp.c
--- ./calendar/gui/dialogs/delete-comp.c 12 Jan 2004 21:19:09 -0000 1.21
+++ ./calendar/gui/dialogs/delete-comp.c 7 Feb 2004 12:42:49 -0000
@@ -23,9 +23,9 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include "../calendar-config.h"
#include "delete-comp.h"
Index: ./calendar/gui/dialogs/delete-error.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/delete-error.c,v
retrieving revision 1.6
diff -u -r1.6 delete-error.c
--- ./calendar/gui/dialogs/delete-error.c 12 Jan 2004 21:19:09 -0000 1.6
+++ ./calendar/gui/dialogs/delete-error.c 7 Feb 2004 12:42:49 -0000
@@ -23,8 +23,8 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include "delete-error.h"
Index: ./calendar/gui/dialogs/cal-prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-prefs-dialog.c,v
retrieving revision 1.34
diff -u -r1.34 cal-prefs-dialog.c
--- ./calendar/gui/dialogs/cal-prefs-dialog.c 6 Feb 2004 03:03:45 -0000 1.34
+++ ./calendar/gui/dialogs/cal-prefs-dialog.c 7 Feb 2004 12:42:49 -0000
@@ -36,6 +36,7 @@
#include "../calendar-config.h"
#include "url-editor-dialog.h"
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
@@ -43,7 +44,6 @@
#include <gtk/gtktogglebutton.h>
#include <libxml/tree.h>
#include <string.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-color-picker.h>
#include <glade/glade.h>
#include <gal/util/e-util.h>
Index: ./calendar/gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.61
diff -u -r1.61 event-page.c
--- ./calendar/gui/dialogs/event-page.c 6 Feb 2004 03:03:45 -0000 1.61
+++ ./calendar/gui/dialogs/event-page.c 7 Feb 2004 12:42:50 -0000
@@ -26,11 +26,11 @@
#endif
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktextview.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include <gal/widgets/e-categories.h>
#include "common/authentication.h"
Index: ./calendar/gui/dialogs/calendar-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.c,v
retrieving revision 1.8
diff -u -r1.8 calendar-setup.c
--- ./calendar/gui/dialogs/calendar-setup.c 30 Jan 2004 15:57:47 -0000 1.8
+++ ./calendar/gui/dialogs/calendar-setup.c 7 Feb 2004 12:42:50 -0000
@@ -23,7 +23,7 @@
#endif
#include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkmenu.h>
Index: ./calendar/gui/dialogs/meeting-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/meeting-page.c,v
retrieving revision 1.76
diff -u -r1.76 meeting-page.c
--- ./calendar/gui/dialogs/meeting-page.c 24 Dec 2003 17:39:04 -0000 1.76
+++ ./calendar/gui/dialogs/meeting-page.c 7 Feb 2004 12:42:50 -0000
@@ -26,12 +26,12 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkcombo.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <gal/util/e-util.h>
Index: ./calendar/gui/dialogs/recur-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recur-comp.c,v
retrieving revision 1.9
diff -u -r1.9 recur-comp.c
--- ./calendar/gui/dialogs/recur-comp.c 12 Jan 2004 21:19:09 -0000 1.9
+++ ./calendar/gui/dialogs/recur-comp.c 7 Feb 2004 12:42:51 -0000
@@ -23,8 +23,8 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include "recur-comp.h"
Index: ./calendar/gui/dialogs/recurrence-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recurrence-page.c,v
retrieving revision 1.54
diff -u -r1.54 recurrence-page.c
--- ./calendar/gui/dialogs/recurrence-page.c 6 Feb 2004 03:03:46 -0000 1.54
+++ ./calendar/gui/dialogs/recurrence-page.c 7 Feb 2004 12:42:51 -0000
@@ -28,6 +28,7 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkmenuitem.h>
@@ -37,7 +38,6 @@
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-time-utils.h>
Index: ./calendar/gui/dialogs/save-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/save-comp.c,v
retrieving revision 1.12
diff -u -r1.12 save-comp.c
--- ./calendar/gui/dialogs/save-comp.c 12 Jan 2004 21:19:09 -0000 1.12
+++ ./calendar/gui/dialogs/save-comp.c 7 Feb 2004 12:42:51 -0000
@@ -24,7 +24,7 @@
#endif
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
#include "save-comp.h"
Index: ./calendar/gui/dialogs/send-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/send-comp.c,v
retrieving revision 1.12
diff -u -r1.12 send-comp.c
--- ./calendar/gui/dialogs/send-comp.c 12 Jan 2004 21:19:09 -0000 1.12
+++ ./calendar/gui/dialogs/send-comp.c 7 Feb 2004 12:42:51 -0000
@@ -23,8 +23,8 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include "send-comp.h"
Index: ./calendar/gui/dialogs/task-details-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-details-page.c,v
retrieving revision 1.38
diff -u -r1.38 task-details-page.c
--- ./calendar/gui/dialogs/task-details-page.c 6 Feb 2004 03:03:46 -0000 1.38
+++ ./calendar/gui/dialogs/task-details-page.c 7 Feb 2004 12:42:52 -0000
@@ -25,9 +25,9 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include <widgets/misc/e-dateedit.h>
#include <widgets/misc/e-url-entry.h>
Index: ./calendar/gui/dialogs/schedule-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/schedule-page.c,v
retrieving revision 1.27
diff -u -r1.27 schedule-page.c
--- ./calendar/gui/dialogs/schedule-page.c 20 Nov 2003 15:11:40 -0000 1.27
+++ ./calendar/gui/dialogs/schedule-page.c 7 Feb 2004 12:42:52 -0000
@@ -21,17 +21,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib.h>
-#include <gtk/gtksignal.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog-util.h>
#include <glade/glade.h>
#include <gal/widgets/e-popup-menu.h>
#include <e-util/e-dialog-widgets.h>
Index: ./calendar/gui/dialogs/task-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-editor.c,v
retrieving revision 1.71
diff -u -r1.71 task-editor.c
--- ./calendar/gui/dialogs/task-editor.c 20 Nov 2003 15:11:40 -0000 1.71
+++ ./calendar/gui/dialogs/task-editor.c 7 Feb 2004 12:42:52 -0000
@@ -23,11 +23,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <string.h>
+#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
#include "task-page.h"
#include "task-details-page.h"
Index: ./calendar/gui/dialogs/copy-source-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/copy-source-dialog.c,v
retrieving revision 1.11
diff -u -r1.11 copy-source-dialog.c
--- ./calendar/gui/dialogs/copy-source-dialog.c 27 Jan 2004 00:19:53 -0000 1.11
+++ ./calendar/gui/dialogs/copy-source-dialog.c 7 Feb 2004 12:42:52 -0000
@@ -18,12 +18,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
-#include <bonobo/bonobo-i18n.h>
#include <widgets/misc/e-source-option-menu.h>
#include "copy-source-dialog.h"
#include "common/authentication.h"
Index: ./calendar/gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.25
diff -u -r1.25 alarm-notify-dialog.c
--- ./calendar/gui/alarm-notify/alarm-notify-dialog.c 20 Nov 2003 15:11:39 -0000 1.25
+++ ./calendar/gui/alarm-notify/alarm-notify-dialog.c 7 Feb 2004 12:42:53 -0000
@@ -19,15 +19,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
#if 0
# include <libgnomeui/gnome-winhints.h>
#endif
Index: ./calendar/gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.55
diff -u -r1.55 alarm-queue.c
--- ./calendar/gui/alarm-notify/alarm-queue.c 15 Jan 2004 18:24:56 -0000 1.55
+++ ./calendar/gui/alarm-notify/alarm-queue.c 7 Feb 2004 12:42:53 -0000
@@ -24,6 +24,7 @@
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-object.h>
#include <gtk/gtksignal.h>
@@ -36,7 +37,6 @@
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkstock.h>
#include <gtk/gtktooltips.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-sound.h>
#include <libgnomeui/gnome-dialog-util.h>
Index: ./calendar/gui/alarm-notify/util.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/util.c,v
retrieving revision 1.2
diff -u -r1.2 util.c
--- ./calendar/gui/alarm-notify/util.c 7 Nov 2003 05:52:01 -0000 1.2
+++ ./calendar/gui/alarm-notify/util.c 7 Feb 2004 12:42:53 -0000
@@ -19,7 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <libgnome/gnome-i18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
#include <e-util/e-time-utils.h>
#include <libecal/e-cal-time-util.h>
#include "config-data.h"
Index: ./calendar/gui/alarm-notify/notify-main.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/notify-main.c,v
retrieving revision 1.38
diff -u -r1.38 notify-main.c
--- ./calendar/gui/alarm-notify/notify-main.c 4 Feb 2004 12:36:12 -0000 1.38
+++ ./calendar/gui/alarm-notify/notify-main.c 7 Feb 2004 12:42:53 -0000
@@ -21,13 +21,13 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-init.h>
#include <libgnome/gnome-sound.h>
#include <libgnomeui/gnome-client.h>
Index: ./calendar/importers/icalendar-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/importers/icalendar-importer.c,v
retrieving revision 1.32
diff -u -r1.32 icalendar-importer.c
--- ./calendar/importers/icalendar-importer.c 4 Feb 2004 21:31:58 -0000 1.32
+++ ./calendar/importers/icalendar-importer.c 7 Feb 2004 12:42:54 -0000
@@ -20,10 +20,15 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
#include <fcntl.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkhbox.h>
@@ -33,7 +38,6 @@
#include <gtk/gtkradiobutton.h>
#include <gtk/gtknotebook.h>
#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <libecal/e-cal.h>
Index: ./calendar/common/authentication.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/common/authentication.c,v
retrieving revision 1.3
diff -u -r1.3 authentication.c
--- ./calendar/common/authentication.c 4 Feb 2004 21:31:57 -0000 1.3
+++ ./calendar/common/authentication.c 7 Feb 2004 12:42:54 -0000
@@ -21,8 +21,12 @@
* USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
-#include <bonobo/bonobo-i18n.h>
+#include <glib/gi18n.h>
#include "e-util/e-passwords.h"
#include "authentication.h"
Index: ./camel/camel-provider.h
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-provider.h,v
retrieving revision 1.39
diff -u -r1.39 camel-provider.h
--- ./camel/camel-provider.h 5 Feb 2004 05:13:56 -0000 1.39
+++ ./camel/camel-provider.h 7 Feb 2004 12:42:54 -0000
@@ -37,6 +37,7 @@
#include <camel/camel-types.h>
#include <camel/camel-object.h>
#include <camel/camel-exception.h>
+#include <camel/camel-i18n.h>
#include <camel/camel-url.h>
#define CAMEL_PROVIDER(obj) ((CamelProvider *)(obj))
Index: ./camel/camel-i18n.h
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-i18n.h,v
retrieving revision 1.1
diff -u -r1.1 camel-i18n.h
--- ./camel/camel-i18n.h 7 Nov 2002 21:34:17 -0000 1.1
+++ ./camel/camel-i18n.h 7 Feb 2004 12:42:54 -0000
@@ -24,6 +24,10 @@
#ifndef __CAMEL_I18N_H__
#define __CAMEL_I18N_H__
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <glib.h>
#ifdef __cplusplus
Index: ./e-util/e-dialog-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-dialog-utils.c,v
retrieving revision 1.17
diff -u -r1.17 e-dialog-utils.c
--- ./e-util/e-dialog-utils.c 25 Mar 2003 16:28:33 -0000 1.17
+++ ./e-util/e-dialog-utils.c 7 Feb 2004 12:42:56 -0000
@@ -22,15 +22,20 @@
* Ettore Perazzoli <ettore ximian com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "e-dialog-utils.h"
+#include <glib/gi18n.h>
+
#include <gdk/gdkx.h>
#include <gtk/gtkfilesel.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkplug.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
Index: ./e-util/e-component-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-component-listener.c,v
retrieving revision 1.6
diff -u -r1.6 e-component-listener.c
--- ./e-util/e-component-listener.c 23 Jul 2003 14:55:52 -0000 1.6
+++ ./e-util/e-component-listener.c 7 Feb 2004 12:42:56 -0000
@@ -11,7 +11,6 @@
#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: ./e-util/e-passwords.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-passwords.c,v
retrieving revision 1.17
diff -u -r1.17 e-passwords.c
--- ./e-util/e-passwords.c 6 Apr 2003 00:18:09 -0000 1.17
+++ ./e-util/e-passwords.c 7 Feb 2004 12:42:56 -0000
@@ -28,8 +28,8 @@
#include "e-passwords.h"
#include <string.h>
+#include <glib/gi18n.h>
#include <libgnome/gnome-config.h>
-#include <libgnome/gnome-i18n.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkcheckbutton.h>
Index: ./e-util/e-categories-config.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-categories-config.c,v
retrieving revision 1.15
diff -u -r1.15 e-categories-config.c
--- ./e-util/e-categories-config.c 22 Feb 2003 23:00:59 -0000 1.15
+++ ./e-util/e-categories-config.c 7 Feb 2004 12:42:56 -0000
@@ -9,8 +9,6 @@
*/
#include <string.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnome/gnome-i18n.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gal/widgets/e-categories.h>
#include "e-categories-config.h"
Index: ./e-util/e-pilot-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-pilot-settings.c,v
retrieving revision 1.3
diff -u -r1.3 e-pilot-settings.c
--- ./e-util/e-pilot-settings.c 27 Jan 2003 06:23:58 -0000 1.3
+++ ./e-util/e-pilot-settings.c 7 Feb 2004 12:42:56 -0000
@@ -25,8 +25,8 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "e-pilot-settings.h"
struct _EPilotSettingsPrivate
Index: ./e-util/e-time-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-time-utils.c,v
retrieving revision 1.16
diff -u -r1.16 e-time-utils.c
--- ./e-util/e-time-utils.c 21 Aug 2003 02:23:14 -0000 1.16
+++ ./e-util/e-time-utils.c 7 Feb 2004 12:42:56 -0000
@@ -8,7 +8,9 @@
* (C) 2001 Ximian, Inc.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#ifdef __linux__
/* We need this to get a prototype for strptime. */
@@ -26,7 +28,7 @@
#include <string.h>
#include <ctype.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include "e-time-utils.h"
Index: ./filter/filter-datespec.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-datespec.c,v
retrieving revision 1.33
diff -u -r1.33 filter-datespec.c
--- ./filter/filter-datespec.c 7 Jan 2004 00:29:28 -0000 1.33
+++ ./filter/filter-datespec.c 7 Feb 2004 12:42:57 -0000
@@ -30,8 +30,8 @@
#include <time.h>
#include <math.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#include "filter-datespec.h"
Index: ./filter/filter-file.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-file.c,v
retrieving revision 1.17
diff -u -r1.17 filter-file.c
--- ./filter/filter-file.c 9 Jun 2003 18:17:10 -0000 1.17
+++ ./filter/filter-file.c 7 Feb 2004 12:42:57 -0000
@@ -29,8 +29,8 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-file-entry.h>
#include "filter-file.h"
Index: ./filter/filter-filter.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-filter.c,v
retrieving revision 1.26
diff -u -r1.26 filter-filter.c
--- ./filter/filter-filter.c 11 Apr 2003 19:11:50 -0000 1.26
+++ ./filter/filter-filter.c 7 Feb 2004 12:42:57 -0000
@@ -27,8 +27,8 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-filter.h"
#include "filter-context.h"
Index: ./filter/filter-input.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-input.c,v
retrieving revision 1.28
diff -u -r1.28 filter-input.c
--- ./filter/filter-input.c 6 Feb 2004 21:00:47 -0000 1.28
+++ ./filter/filter-input.c 7 Feb 2004 12:42:57 -0000
@@ -29,8 +29,8 @@
#include <sys/types.h>
#include <regex.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-input.h"
#include "e-util/e-sexp.h"
Index: ./filter/filter-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-editor.c,v
retrieving revision 1.42
diff -u -r1.42 filter-editor.c
--- ./filter/filter-editor.c 11 Apr 2003 19:11:50 -0000 1.42
+++ ./filter/filter-editor.c 7 Feb 2004 12:42:57 -0000
@@ -20,13 +20,12 @@
* Boston, MA 02111-1307, USA.
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-editor.h"
#include "filter-filter.h"
Index: ./filter/filter-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-folder.c,v
retrieving revision 1.37
diff -u -r1.37 filter-folder.c
--- ./filter/filter-folder.c 21 Oct 2003 18:51:23 -0000 1.37
+++ ./filter/filter-folder.c 7 Feb 2004 12:42:57 -0000
@@ -27,8 +27,8 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-folder.h"
#include "mail/em-folder-selection-button.h"
Index: ./filter/filter-label.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-label.c,v
retrieving revision 1.14
diff -u -r1.14 filter-label.c
--- ./filter/filter-label.c 9 Jun 2003 18:17:10 -0000 1.14
+++ ./filter/filter-label.c 7 Feb 2004 12:42:57 -0000
@@ -28,10 +28,10 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-dialog-util.h>
#include <libgnomeui/gnome-file-entry.h>
Index: ./filter/filter-option.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-option.c,v
retrieving revision 1.27
diff -u -r1.27 filter-option.c
--- ./filter/filter-option.c 26 Nov 2002 11:25:51 -0000 1.27
+++ ./filter/filter-option.c 7 Feb 2004 12:42:57 -0000
@@ -27,8 +27,8 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-option.h"
#include "filter-part.h"
Index: ./filter/filter-part.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-part.c,v
retrieving revision 1.25
diff -u -r1.25 filter-part.c
--- ./filter/filter-part.c 2 Jan 2003 18:33:06 -0000 1.25
+++ ./filter/filter-part.c 7 Feb 2004 12:42:57 -0000
@@ -28,9 +28,9 @@
#include <stdlib.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkhbox.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-part.h"
Index: ./filter/filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/filter-rule.c,v
retrieving revision 1.57
diff -u -r1.57 filter-rule.c
--- ./filter/filter-rule.c 11 Apr 2003 19:11:50 -0000 1.57
+++ ./filter/filter-rule.c 7 Feb 2004 12:42:58 -0000
@@ -27,8 +27,8 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "filter-rule.h"
#include "filter-context.h"
Index: ./filter/rule-context.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/rule-context.c,v
retrieving revision 1.53
diff -u -r1.53 rule-context.c
--- ./filter/rule-context.c 20 Jan 2004 04:29:31 -0000 1.53
+++ ./filter/rule-context.c 7 Feb 2004 12:42:58 -0000
@@ -32,8 +32,8 @@
#include <fcntl.h>
#include <errno.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-xml-utils.h>
#include "rule-context.h"
Index: ./filter/rule-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/rule-editor.c,v
retrieving revision 1.56
diff -u -r1.56 rule-editor.c
--- ./filter/rule-editor.c 7 Jan 2004 00:29:28 -0000 1.56
+++ ./filter/rule-editor.c 7 Feb 2004 12:42:58 -0000
@@ -28,7 +28,7 @@
/* for getenv only, remove when getenv need removed */
#include <stdlib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "rule-editor.h"
Index: ./filter/score-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/score-editor.c,v
retrieving revision 1.17
diff -u -r1.17 score-editor.c
--- ./filter/score-editor.c 7 Feb 2003 21:51:51 -0000 1.17
+++ ./filter/score-editor.c 7 Feb 2004 12:42:58 -0000
@@ -25,8 +25,8 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "score-editor.h"
#include "score-rule.h"
Index: ./filter/score-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/score-rule.c,v
retrieving revision 1.11
diff -u -r1.11 score-rule.c
--- ./filter/score-rule.c 26 Nov 2002 11:25:51 -0000 1.11
+++ ./filter/score-rule.c 7 Feb 2004 12:42:58 -0000
@@ -27,8 +27,8 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "score-rule.h"
Index: ./filter/vfolder-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/vfolder-editor.c,v
retrieving revision 1.23
diff -u -r1.23 vfolder-editor.c
--- ./filter/vfolder-editor.c 11 Apr 2003 19:11:50 -0000 1.23
+++ ./filter/vfolder-editor.c 7 Feb 2004 12:42:58 -0000
@@ -25,8 +25,8 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include "vfolder-editor.h"
#include "vfolder-rule.h"
Index: ./filter/vfolder-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/filter/vfolder-rule.c,v
retrieving revision 1.42
diff -u -r1.42 vfolder-rule.c
--- ./filter/vfolder-rule.c 16 Jan 2004 07:00:22 -0000 1.42
+++ ./filter/vfolder-rule.c 7 Feb 2004 12:42:59 -0000
@@ -27,9 +27,9 @@
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <libgnome/gnome-i18n.h>
#include "camel/camel-url.h"
#include "vfolder-context.h"
Index: ./mail/mail-mt.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-mt.c,v
retrieving revision 1.76
diff -u -r1.76 mail-mt.c
--- ./mail/mail-mt.c 2 Dec 2003 04:13:18 -0000 1.76
+++ ./mail/mail-mt.c 7 Feb 2004 12:42:59 -0000
@@ -9,12 +9,12 @@
#include <errno.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkstock.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/widgets/e-gui-utils.h>
#include "e-util/e-msgport.h"
Index: ./mail/mail-autofilter.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-autofilter.c,v
retrieving revision 1.46
diff -u -r1.46 mail-autofilter.c
--- ./mail/mail-autofilter.c 27 Jan 2004 12:35:25 -0000 1.46
+++ ./mail/mail-autofilter.c 7 Feb 2004 12:42:59 -0000
@@ -32,7 +32,7 @@
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-popup-menu.h>
Index: ./mail/em-folder-selector.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-selector.c,v
retrieving revision 1.15
diff -u -r1.15 em-folder-selector.c
--- ./mail/em-folder-selector.c 2 Feb 2004 08:10:47 -0000 1.15
+++ ./mail/em-folder-selector.c 7 Feb 2004 12:42:59 -0000
@@ -27,7 +27,7 @@
#include <string.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
Index: ./mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.29
diff -u -r1.29 em-folder-view.c
--- ./mail/em-folder-view.c 6 Feb 2004 17:44:54 -0000 1.29
+++ ./mail/em-folder-view.c 7 Feb 2004 12:43:00 -0000
@@ -26,6 +26,8 @@
#include <string.h>
+#include <glib/gi18n.h>
+
#include <gtk/gtkvbox.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkvpaned.h>
Index: ./mail/mail-vfolder.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-vfolder.c,v
retrieving revision 1.116
diff -u -r1.116 mail-vfolder.c
--- ./mail/mail-vfolder.c 5 Feb 2004 05:14:59 -0000 1.116
+++ ./mail/mail-vfolder.c 7 Feb 2004 12:43:01 -0000
@@ -25,8 +25,8 @@
#endif
#include <glib.h>
+#include <glib/gi18n.h>
#include <string.h>
-#include <libgnome/gnome-i18n.h>
#include "mail-component.h"
#include "mail-vfolder.h"
Index: ./mail/em-junk-filter.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-junk-filter.c,v
retrieving revision 1.14
diff -u -r1.14 em-junk-filter.c
--- ./mail/em-junk-filter.c 6 Feb 2004 17:44:54 -0000 1.14
+++ ./mail/em-junk-filter.c 7 Feb 2004 12:43:01 -0000
@@ -20,6 +20,10 @@
* USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
@@ -36,6 +40,8 @@
#include "mail-session.h"
#include "em-junk-filter.h"
+#include <glib/gi18n.h>
+
#include <gconf/gconf.h>
#include <gconf/gconf-client.h>
Index: ./mail/em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.10
diff -u -r1.10 em-popup.c
--- ./mail/em-popup.c 19 Jan 2004 08:41:11 -0000 1.10
+++ ./mail/em-popup.c 7 Feb 2004 12:43:02 -0000
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
#include <stdlib.h>
@@ -14,6 +17,7 @@
#include <libgnome/gnome-url.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include "em-popup.h"
#include "e-util/e-msgport.h"
Index: ./shell/e-shell-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-utils.c,v
retrieving revision 1.13
diff -u -r1.13 e-shell-utils.c
--- ./shell/e-shell-utils.c 6 Mar 2003 19:32:46 -0000 1.13
+++ ./shell/e-shell-utils.c 7 Feb 2004 12:43:02 -0000
@@ -27,9 +27,7 @@
#include <string.h>
#include <glib.h>
-
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "e-shell-constants.h"
#include "e-shell-utils.h"
Index: ./shell/e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.64
diff -u -r1.64 e-shell-importer.c
--- ./shell/e-shell-importer.c 7 Feb 2004 01:25:21 -0000 1.64
+++ ./shell/e-shell-importer.c 7 Feb 2004 12:43:03 -0000
@@ -31,7 +31,7 @@
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-edge.h>
#include <libgnomeui/gnome-druid-page-standard.h>
Index: ./shell/e-shortcuts.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shortcuts.c,v
retrieving revision 1.72
diff -u -r1.72 e-shortcuts.c
--- ./shell/e-shortcuts.c 12 Nov 2003 21:13:02 -0000 1.72
+++ ./shell/e-shortcuts.c 7 Feb 2004 12:43:03 -0000
@@ -48,6 +48,7 @@
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkobject.h>
#include <gtk/gtksignal.h>
@@ -56,8 +57,6 @@
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include <libgnome/gnome-i18n.h>
-
#include <gal/util/e-xml-utils.h>
#include <gal/util/e-util.h>
#include <gal/shortcut-bar/e-shortcut-bar.h>
Index: ./shell/e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.18
diff -u -r1.18 e-shell-window.c
--- ./shell/e-shell-window.c 26 Jan 2004 21:56:03 -0000 1.18
+++ ./shell/e-shell-window.c 7 Feb 2004 12:43:03 -0000
@@ -20,7 +20,9 @@
* Author: Ettore Perazzoli <ettore ximian com>
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "e-shell-window.h"
@@ -35,6 +37,7 @@
#include <gal/util/e-util.h>
+#include <glib/gi18n.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtkhpaned.h>
@@ -49,8 +52,6 @@
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-widget.h>
-#include <libgnome/gnome-i18n.h>
-
#include <gconf/gconf-client.h>
#include <string.h>
Index: ./shell/e-shortcuts-view.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shortcuts-view.c,v
retrieving revision 1.65
diff -u -r1.65 e-shortcuts-view.c
--- ./shell/e-shortcuts-view.c 22 Apr 2003 19:49:22 -0000 1.65
+++ ./shell/e-shortcuts-view.c 7 Feb 2004 12:43:04 -0000
@@ -34,12 +34,11 @@
#include "e-util/e-request.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkentry.h>
#include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
-
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-popup-menu.h>
Index: ./shell/e-shell.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell.c,v
retrieving revision 1.238
diff -u -r1.238 e-shell.c
--- ./shell/e-shell.c 4 Feb 2004 20:45:45 -0000 1.238
+++ ./shell/e-shell.c 7 Feb 2004 12:43:05 -0000
@@ -41,6 +41,7 @@
#include "importer/intelligent.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
@@ -48,9 +49,6 @@
#include <X11/Xatom.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-
/* (For the displayName stuff.) */
#include <gdk/gdkprivate.h>
#include <X11/Xlib.h>
Index: ./shell/main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.147
diff -u -r1.147 main.c
--- ./shell/main.c 4 Feb 2004 10:55:25 -0000 1.147
+++ ./shell/main.c 7 Feb 2004 12:43:05 -0000
@@ -39,6 +39,8 @@
#include <gconf/gconf-client.h>
+#include <glib/gi18n.h>
+
#include <gtk/gtkalignment.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkframe.h>
@@ -52,8 +54,6 @@
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-window-icon.h>
Index: ./shell/e-component-registry.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-component-registry.c,v
retrieving revision 1.44
diff -u -r1.44 e-component-registry.c
--- ./shell/e-component-registry.c 2 Feb 2004 21:57:37 -0000 1.44
+++ ./shell/e-component-registry.c 7 Feb 2004 12:43:05 -0000
@@ -30,7 +30,7 @@
#include "e-util/e-lang-utils.h"
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include <bonobo/bonobo-object.h>
Index: ./shell/e-shell-config-autocompletion.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-config-autocompletion.c,v
retrieving revision 1.11
diff -u -r1.11 e-shell-config-autocompletion.c
--- ./shell/e-shell-config-autocompletion.c 10 Jan 2003 21:39:33 -0000 1.11
+++ ./shell/e-shell-config-autocompletion.c 7 Feb 2004 12:43:07 -0000
@@ -34,7 +34,7 @@
#include <bonobo/bonobo-exception.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtksignal.h>
Index: ./shell/e-shell-config-default-folders.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-config-default-folders.c,v
retrieving revision 1.14
diff -u -r1.14 e-shell-config-default-folders.c
--- ./shell/e-shell-config-default-folders.c 27 Jan 2003 21:09:56 -0000 1.14
+++ ./shell/e-shell-config-default-folders.c 7 Feb 2004 12:43:07 -0000
@@ -29,12 +29,11 @@
#include "evolution-folder-selector-button.h"
+#include <glib/gi18n.h>
#include <glade/glade-xml.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-
#include <gconf/gconf-client.h>
Index: ./shell/e-shell-config-folder-settings.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-config-folder-settings.c,v
retrieving revision 1.2
diff -u -r1.2 e-shell-config-folder-settings.c
--- ./shell/e-shell-config-folder-settings.c 3 Nov 2002 16:43:17 -0000 1.2
+++ ./shell/e-shell-config-folder-settings.c 7 Feb 2004 12:43:07 -0000
@@ -24,7 +24,6 @@
#include <config.h>
#endif
-
#include "e-shell-config-folder-settings.h"
#include "e-shell-config-offline.h"
#include "e-shell-config-autocompletion.h"
@@ -37,7 +36,7 @@
#include <bonobo/bonobo-exception.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtklabel.h>
Index: ./shell/evolution-shell-component-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-shell-component-utils.c,v
retrieving revision 1.14
diff -u -r1.14 evolution-shell-component-utils.c
--- ./shell/evolution-shell-component-utils.c 25 Mar 2003 15:48:33 -0000 1.14
+++ ./shell/evolution-shell-component-utils.c 7 Feb 2004 12:43:07 -0000
@@ -28,8 +28,7 @@
#include "e-util/e-dialog-utils.h"
#include <string.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
+#include <glib/gi18n.h>
#include <bonobo/bonobo-ui-util.h>
#include <bonobo/bonobo-moniker-util.h>
#include <bonobo/bonobo-exception.h>
Index: ./shell/e-user-creatable-items-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-user-creatable-items-handler.c,v
retrieving revision 1.5
diff -u -r1.5 e-user-creatable-items-handler.c
--- ./shell/e-user-creatable-items-handler.c 14 Dec 2003 15:54:39 -0000 1.5
+++ ./shell/e-user-creatable-items-handler.c 7 Feb 2004 12:43:07 -0000
@@ -38,7 +38,7 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-control.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktooltips.h>
Index: ./shell/e-shell-folder-creation-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-folder-creation-dialog.c,v
retrieving revision 1.51
diff -u -r1.51 e-shell-folder-creation-dialog.c
--- ./shell/e-shell-folder-creation-dialog.c 19 May 2003 19:41:05 -0000 1.51
+++ ./shell/e-shell-folder-creation-dialog.c 7 Feb 2004 12:43:07 -0000
@@ -26,8 +26,7 @@
#include <string.h>
#include <glib.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
+#include <glib/gi18n.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkdialog.h>
Index: ./shell/evolution-folder-selector-button.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-folder-selector-button.c,v
retrieving revision 1.23
diff -u -r1.23 evolution-folder-selector-button.c
--- ./shell/evolution-folder-selector-button.c 7 Apr 2003 20:20:00 -0000 1.23
+++ ./shell/evolution-folder-selector-button.c 7 Feb 2004 12:43:07 -0000
@@ -28,12 +28,12 @@
#include <gal/util/e-util.h>
+#include <glib/gi18n.h>
+
#include <gtk/gtkhbox.h>
#include <gtk/gtkimage.h>
#include <gtk/gtklabel.h>
-#include <libgnome/gnome-i18n.h>
-
#include <string.h>
Index: ./shell/e-shell-folder-title-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-folder-title-bar.c,v
retrieving revision 1.50
diff -u -r1.50 e-shell-folder-title-bar.c
--- ./shell/e-shell-folder-title-bar.c 8 Apr 2003 20:44:58 -0000 1.50
+++ ./shell/e-shell-folder-title-bar.c 7 Feb 2004 12:43:08 -0000
@@ -25,13 +25,13 @@
#endif
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkrc.h>
#include <gtk/gtksignal.h>
#include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gal/util/e-util.h>
Index: ./shell/evolution-test-component.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-test-component.c,v
retrieving revision 1.42
diff -u -r1.42 evolution-test-component.c
--- ./shell/evolution-test-component.c 12 Jan 2004 05:26:25 -0000 1.42
+++ ./shell/evolution-test-component.c 7 Feb 2004 12:43:08 -0000
@@ -26,9 +26,9 @@
#include <errno.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <bonobo/bonobo-shlib-factory.h>
#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-i18n.h>
#include <bonobo/bonobo-exception.h>
#include <gtk/gtklabel.h>
#include "e-task-bar.h"
Index: ./shell/e-shortcuts-view-model.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shortcuts-view-model.c,v
retrieving revision 1.30
diff -u -r1.30 e-shortcuts-view-model.c
--- ./shell/e-shortcuts-view-model.c 2 Dec 2002 03:23:57 -0000 1.30
+++ ./shell/e-shortcuts-view-model.c 7 Feb 2004 12:43:08 -0000
@@ -23,17 +23,11 @@
/* FIXME. This really sucks. We are using the model/view approach in the
dumbest possible way. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include "e-shortcuts-view-model.h"
#include "e-icon-factory.h"
#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
Index: ./shell/e-shell-window-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window-commands.c,v
retrieving revision 1.11
diff -u -r1.11 e-shell-window-commands.c
--- ./shell/e-shell-window-commands.c 6 Feb 2004 17:24:25 -0000 1.11
+++ ./shell/e-shell-window-commands.c 7 Feb 2004 12:43:08 -0000
@@ -35,9 +35,10 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-passwords.h"
+#include <glib/gi18n.h>
+
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-url.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
Index: ./shell/e-shell-offline-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-offline-handler.c,v
retrieving revision 1.35
diff -u -r1.35 e-shell-offline-handler.c
--- ./shell/e-shell-offline-handler.c 30 Nov 2003 20:53:42 -0000 1.35
+++ ./shell/e-shell-offline-handler.c 7 Feb 2004 12:43:08 -0000
@@ -31,6 +31,8 @@
#include "e-shell-marshal.h"
+#include <glib/gi18n.h>
+
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkclist.h>
#include <gtk/gtkdialog.h>
@@ -43,8 +45,6 @@
#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
-
#include <glade/glade-xml.h>
#include <bonobo/bonobo-main.h>
Index: ./shell/e-shell-shared-folder-picker-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-shared-folder-picker-dialog.c,v
retrieving revision 1.25
diff -u -r1.25 e-shell-shared-folder-picker-dialog.c
--- ./shell/e-shell-shared-folder-picker-dialog.c 1 Dec 2003 22:14:42 -0000 1.25
+++ ./shell/e-shell-shared-folder-picker-dialog.c 7 Feb 2004 12:43:09 -0000
@@ -35,7 +35,8 @@
#include "e-util/e-dialog-utils.h"
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
+
#include <glade/glade.h>
#include <bonobo/bonobo-exception.h>
Index: ./shell/e-shell-folder-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-folder-commands.c,v
retrieving revision 1.59
diff -u -r1.59 e-shell-folder-commands.c
--- ./shell/e-shell-folder-commands.c 9 Jul 2003 19:54:25 -0000 1.59
+++ ./shell/e-shell-folder-commands.c 7 Feb 2004 12:43:09 -0000
@@ -34,8 +34,7 @@
#include "e-shell-folder-selection-dialog.h"
#include "e-shell-utils.h"
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
+#include <glib/gi18n.h>
#include <gtk/gtkentry.h>
#include <gtk/gtklabel.h>
Index: ./shell/importer/intelligent.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/importer/intelligent.c,v
retrieving revision 1.19
diff -u -r1.19 intelligent.c
--- ./shell/importer/intelligent.c 7 Feb 2004 01:20:15 -0000 1.19
+++ ./shell/importer/intelligent.c 7 Feb 2004 12:43:09 -0000
@@ -28,6 +28,7 @@
#include "intelligent.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtkbox.h>
@@ -48,8 +49,6 @@
#include <gtk/gtkstock.h>
#include <libgnome/gnome-config.h>
-/*#include <libgnome/gnome-util.h>*/
-#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-widget.h>
Index: ./smime/gui/certificate-manager.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/certificate-manager.c,v
retrieving revision 1.7
diff -u -r1.7 certificate-manager.c
--- ./smime/gui/certificate-manager.c 5 Jan 2004 20:49:43 -0000 1.7
+++ ./smime/gui/certificate-manager.c 7 Feb 2004 12:43:10 -0000
@@ -20,11 +20,15 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#define GLADE_FILE_NAME "smime-ui.glade"
-#include <gtk/gtk.h>
+#include <glib/gi18n.h>
-#include <libgnome/gnome-i18n.h>
+#include <gtk/gtk.h>
#include <glade/glade.h>
#include "evolution-config-control.h"
Index: ./smime/gui/e-cert-selector.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/e-cert-selector.c,v
retrieving revision 1.4
diff -u -r1.4 e-cert-selector.c
--- ./smime/gui/e-cert-selector.c 8 Jan 2004 06:00:27 -0000 1.4
+++ ./smime/gui/e-cert-selector.c 7 Feb 2004 12:43:10 -0000
@@ -18,7 +18,11 @@
* Boston, MA 02111-1307, USA.
*/
-#include <libgnome/gnome-i18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
Index: ./smime/gui/certificate-viewer.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/certificate-viewer.c,v
retrieving revision 1.5
diff -u -r1.5 certificate-viewer.c
--- ./smime/gui/certificate-viewer.c 5 Jan 2004 19:44:42 -0000 1.5
+++ ./smime/gui/certificate-viewer.c 7 Feb 2004 12:43:10 -0000
@@ -20,13 +20,18 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "certificate-viewer.h"
#include "e-asn1-object.h"
+#include <glib/gi18n.h>
+
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
#define GLADE_FILE_NAME "smime-ui.glade"
Index: ./smime/gui/component.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/gui/component.c,v
retrieving revision 1.1
diff -u -r1.1 component.c
--- ./smime/gui/component.c 5 Jan 2004 20:49:43 -0000 1.1
+++ ./smime/gui/component.c 7 Feb 2004 12:43:10 -0000
@@ -20,7 +20,12 @@
*
*/
-#include <libgnome/gnome-i18n.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
+
#include "e-cert-db.h"
#include "e-util/e-passwords.h"
#include "pk11func.h"
Index: ./smime/lib/e-cert-db.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert-db.c,v
retrieving revision 1.6
diff -u -r1.6 e-cert-db.c
--- ./smime/lib/e-cert-db.c 5 Jan 2004 21:04:02 -0000 1.6
+++ ./smime/lib/e-cert-db.c 7 Feb 2004 12:43:11 -0000
@@ -55,6 +55,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/* XXX toshok why oh *why* god WHY did they do this? no fucking
sense */
/* private NSS defines used by PSM */
@@ -80,8 +84,8 @@
#include "prmem.h"
#include "e-util/e-passwords.h"
#include "e-util/e-dialog-utils.h"
+#include <glib/gi18n.h>
#include <gtk/gtkmessagedialog.h>
-#include <libgnome/gnome-i18n.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
Index: ./smime/lib/e-cert.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-cert.c,v
retrieving revision 1.8
diff -u -r1.8 e-cert.c
--- ./smime/lib/e-cert.c 5 Dec 2003 22:35:15 -0000 1.8
+++ ./smime/lib/e-cert.c 7 Feb 2004 12:43:11 -0000
@@ -55,9 +55,14 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <time.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
+
#include <gal/util/e-util.h> /* for e_utf8_strftime, what about e_time_format_time? */
#include "e-cert.h"
Index: ./smime/lib/e-pkcs12.c
===================================================================
RCS file: /cvs/gnome/evolution/smime/lib/e-pkcs12.c,v
retrieving revision 1.3
diff -u -r1.3 e-pkcs12.c
--- ./smime/lib/e-pkcs12.c 5 Jan 2004 20:49:44 -0000 1.3
+++ ./smime/lib/e-pkcs12.c 7 Feb 2004 12:43:11 -0000
@@ -55,8 +55,12 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <libgnome/gnome-i18n.h>
#include <time.h>
#include <fcntl.h>
Index: ./tools/evolution-launch-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/tools/evolution-launch-composer.c,v
retrieving revision 1.2
diff -u -r1.2 evolution-launch-composer.c
--- ./tools/evolution-launch-composer.c 28 Feb 2003 07:48:26 -0000 1.2
+++ ./tools/evolution-launch-composer.c 7 Feb 2004 12:43:11 -0000
@@ -21,18 +21,20 @@
* Boston, MA 02111-1307, USA.
**/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <Evolution-Composer.h>
#include <string.h>
+#include <glib/gi18n.h>
+#include <gtk/gtkmain.h>
#include <gal/util/e-util.h>
#include <bonobo-activation/bonobo-activation.h>
-#include <gtk/gtkmain.h>
#include <bonobo/bonobo-main.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomevfs/gnome-vfs-ops.h>
Index: ./tools/killev.c
===================================================================
RCS file: /cvs/gnome/evolution/tools/killev.c,v
retrieving revision 1.5
diff -u -r1.5 killev.c
--- ./tools/killev.c 1 Dec 2003 22:14:43 -0000 1.5
+++ ./tools/killev.c 7 Feb 2004 12:43:12 -0000
@@ -29,10 +29,13 @@
#include <string.h>
#include <sys/wait.h>
+#include <glib/gi18n.h>
+
+#include <libgnome/gnome-init.h>
+#include <libgnome/gnome-program.h>
+
#include <bonobo/bonobo-exception.h>
#include <bonobo-activation/bonobo-activation.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
#include "e-util/e-lang-utils.h"
Index: ./widgets/menus/gal-view-menus.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/menus/gal-view-menus.c,v
retrieving revision 1.43
diff -u -r1.43 gal-view-menus.c
--- ./widgets/menus/gal-view-menus.c 10 Dec 2003 01:12:42 -0000 1.43
+++ ./widgets/menus/gal-view-menus.c 7 Feb 2004 12:43:12 -0000
@@ -7,17 +7,20 @@
*
* (C) 2000, 2001 Ximian, Inc.
*/
+
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include "gal-view-menus.h"
#include <stdlib.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <gtk/gtksignal.h>
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
#include <libgnomeui/gnome-dialog.h>
-#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-ui-util.h>
#include <gal/util/e-util.h>
#include <gal/util/e-xml-utils.h>
Index: ./widgets/misc/e-calendar-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-calendar-item.c,v
retrieving revision 1.40
diff -u -r1.40 e-calendar-item.c
--- ./widgets/misc/e-calendar-item.c 5 Dec 2003 02:01:46 -0000 1.40
+++ ./widgets/misc/e-calendar-item.c 7 Feb 2004 12:43:13 -0000
@@ -37,13 +37,13 @@
#include <time.h>
#include <string.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtklabel.h>
#include <gtk/gtksignal.h>
#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
static const int e_calendar_item_days_in_month[12] = {
Index: ./widgets/misc/e-cell-date-edit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cell-date-edit.c,v
retrieving revision 1.20
diff -u -r1.20 e-cell-date-edit.c
--- ./widgets/misc/e-cell-date-edit.c 18 Dec 2003 03:59:42 -0000 1.20
+++ ./widgets/misc/e-cell-date-edit.c 7 Feb 2004 12:43:14 -0000
@@ -36,6 +36,7 @@
#include <string.h>
#include <time.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
@@ -45,7 +46,6 @@
#include <gal/e-table/e-cell-text.h>
#include <libgnomeui/gnome-messagebox.h>
-#include <libgnome/gnome-i18n.h>
#include "e-util/e-time-utils.h"
/* This depends on ECalendar which is why I didn't put it in gal. */
Index: ./widgets/misc/e-cell-percent.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cell-percent.c,v
retrieving revision 1.6
diff -u -r1.6 e-cell-percent.c
--- ./widgets/misc/e-cell-percent.c 7 Apr 2003 02:09:59 -0000 1.6
+++ ./widgets/misc/e-cell-percent.c 7 Feb 2004 12:43:14 -0000
@@ -26,16 +26,18 @@
* in an ETable.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <ctype.h>
#include <sys/time.h>
#include <unistd.h>
#include <stdio.h>
+#include <glib/gi18n.h>
#include <gal/util/e-util.h>
#include <libgnomeui/gnome-messagebox.h>
-#include <libgnome/gnome-i18n.h>
#include "e-cell-percent.h"
Index: ./widgets/misc/e-charset-picker.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-charset-picker.c,v
retrieving revision 1.17
diff -u -r1.17 e-charset-picker.c
--- ./widgets/misc/e-charset-picker.c 19 Jun 2003 20:05:57 -0000 1.17
+++ ./widgets/misc/e-charset-picker.c 7 Feb 2004 12:43:14 -0000
@@ -28,6 +28,8 @@
#include <string.h>
#include <iconv.h>
+#include <glib/gi18n.h>
+
#include <gtk/gtkvbox.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkstock.h>
@@ -36,8 +38,6 @@
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-i18n.h>
-
#include <bonobo/bonobo-ui-node.h>
#include <bonobo/bonobo-ui-util.h>
Index: ./widgets/misc/e-dateedit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dateedit.c,v
retrieving revision 1.38
diff -u -r1.38 e-dateedit.c
--- ./widgets/misc/e-dateedit.c 5 Dec 2003 02:01:46 -0000 1.38
+++ ./widgets/misc/e-dateedit.c 7 Feb 2004 12:43:15 -0000
@@ -41,6 +41,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtkbbox.h>
@@ -55,7 +56,6 @@
#include <gtk/gtkwindow.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkvbox.h>
-#include <libgnome/gnome-i18n.h>
#include <gal/util/e-util.h>
#include "e-util/e-time-utils.h"
#include "e-calendar.h"
Index: ./widgets/misc/e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.75
diff -u -r1.75 e-search-bar.c
--- ./widgets/misc/e-search-bar.c 29 Jan 2004 01:57:56 -0000 1.75
+++ ./widgets/misc/e-search-bar.c 7 Feb 2004 12:43:15 -0000
@@ -30,6 +30,8 @@
#include <config.h>
#endif
+#include <glib/gi18n.h>
+
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtkmenuitem.h>
@@ -39,8 +41,6 @@
#include <gal/widgets/e-unicode.h>
#include <gal/widgets/e-gui-utils.h>
-#include <libgnome/gnome-i18n.h>
-
#include <bonobo/bonobo-ui-util.h>
#include <stdlib.h>
Index: ./widgets/misc/e-image-chooser.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-image-chooser.c,v
retrieving revision 1.3
diff -u -r1.3 e-image-chooser.c
--- ./widgets/misc/e-image-chooser.c 3 Feb 2004 02:32:29 -0000 1.3
+++ ./widgets/misc/e-image-chooser.c 7 Feb 2004 12:43:16 -0000
@@ -18,11 +18,15 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
#include <stdio.h>
#include <string.h>
+#include <glib/gi18n.h>
+
#include <gtk/gtkalignment.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkimage.h>
@@ -30,7 +34,6 @@
#include <gtk/gtkdnd.h>
#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnome/gnome-i18n.h>
#include "e-image-chooser.h"
#include "e-util-marshal.h"
Index: ./widgets/misc/e-filter-bar.h
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.h,v
retrieving revision 1.20
diff -u -r1.20 e-filter-bar.h
--- ./widgets/misc/e-filter-bar.h 28 Jan 2004 22:03:15 -0000 1.20
+++ ./widgets/misc/e-filter-bar.h 7 Feb 2004 12:43:16 -0000
@@ -20,7 +20,13 @@
#ifndef __E_FILTER_BAR_H__
#define __E_FILTER_BAR_H__
-#include <gtk/gtk.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib/gi18n.h>
+
+#include <gtk/gtkwidget.h>
#include "e-search-bar.h"
Index: ./widgets/misc/e-activity-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-activity-handler.c,v
retrieving revision 1.1
diff -u -r1.1 e-activity-handler.c
--- ./widgets/misc/e-activity-handler.c 3 Feb 2004 17:31:50 -0000 1.1
+++ ./widgets/misc/e-activity-handler.c 7 Feb 2004 12:43:16 -0000
@@ -26,10 +26,11 @@
#include "e-activity-handler.h"
+#include <glib/gi18n.h>
+
#include <gtk/gtksignal.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-popup-menu.h>
#include <gal/util/e-util.h>
Index: ./widgets/misc/e-filter-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.c,v
retrieving revision 1.45
diff -u -r1.45 e-filter-bar.c
--- ./widgets/misc/e-filter-bar.c 30 Jan 2004 18:10:52 -0000 1.45
+++ ./widgets/misc/e-filter-bar.c 7 Feb 2004 12:43:16 -0000
@@ -32,7 +32,7 @@
#include <libxml/tree.h>
#include <libxml/parser.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
#include "e-dropdown-button.h"
#include "e-filter-bar.h"
Index: ./widgets/misc/e-clipped-label.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-clipped-label.c,v
retrieving revision 1.15
diff -u -r1.15 e-clipped-label.c
--- ./widgets/misc/e-clipped-label.c 27 Jan 2003 04:59:48 -0000 1.15
+++ ./widgets/misc/e-clipped-label.c 7 Feb 2004 12:43:16 -0000
@@ -39,8 +39,7 @@
#include <string.h>
#include <glib.h>
-#include <gdk/gdki18n.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
static void e_clipped_label_class_init (EClippedLabelClass *class);
Index: ./widgets/misc/e-task-widget.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-task-widget.c,v
retrieving revision 1.1
diff -u -r1.1 e-task-widget.c
--- ./widgets/misc/e-task-widget.c 3 Feb 2004 17:31:50 -0000 1.1
+++ ./widgets/misc/e-task-widget.c 7 Feb 2004 12:43:16 -0000
@@ -26,14 +26,14 @@
#include "e-task-widget.h"
+#include <glib/gi18n.h>
+
#include <gtk/gtkframe.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkimage.h>
#include <gtk/gtktooltips.h>
-#include <libgnome/gnome-i18n.h>
-
#include <gal/util/e-util.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
