From 577f9fdffbbb9e57b44b0290f1aea8088c6f0976 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 11 Jan 2009 04:52:38 +0000
Subject: Remove unneeded #include <libgnome/gnome-util.h>.

2009-01-10  Matthew Barnes  <mbarnes@redhat.com>

	* addressbook/gui/contact-editor/e-contact-editor-address.c:
	* addressbook/gui/contact-editor/e-contact-editor-fullname.c:
	* addressbook/gui/contact-editor/e-contact-editor-im.c:
	* addressbook/gui/widgets/e-addressbook-view.c:
	* addressbook/printing/e-contact-print.c:
	* calendar/gui/calendar-commands.c:
	* calendar/gui/e-cal-list-view.c:
	* calendar/gui/e-day-view.c:
	* calendar/gui/e-itip-control.c:
	* calendar/gui/e-meeting-list-view.c:
	* calendar/gui/e-meeting-store.c:
	* calendar/gui/e-week-view.c:
	* calendar/gui/gnome-cal.c:
	* calendar/gui/memos-control.c:
	* calendar/gui/tasks-control.c:
	* e-util/e-dialog-utils.c:
	* mail/em-folder-view.c:
	* mail/importers/mail-importer.c:
	* shell/e-shell.c:
	* shell/evolution-shell-component-utils.c:
	* shell/importer/intelligent.c:
	* shell/main.c:
	* widgets/menus/gal-view-collection.c:
	* widgets/menus/gal-view-instance.c:
	Remove unneeded #include <libgnome/gnome-util.h>.


svn path=/trunk/; revision=37036
---
 addressbook/ChangeLog                                      |  9 +++++++++
 addressbook/gui/contact-editor/e-contact-editor-address.c  |  1 -
 addressbook/gui/contact-editor/e-contact-editor-fullname.c |  1 -
 addressbook/gui/contact-editor/e-contact-editor-im.c       |  1 -
 addressbook/gui/widgets/e-addressbook-view.c               |  4 ++--
 addressbook/printing/e-contact-print.c                     |  1 -
 calendar/ChangeLog                                         | 14 ++++++++++++++
 calendar/gui/calendar-commands.c                           |  1 -
 calendar/gui/e-cal-list-view.c                             |  1 -
 calendar/gui/e-day-view.c                                  |  1 -
 calendar/gui/e-itip-control.c                              |  1 -
 calendar/gui/e-meeting-list-view.c                         |  1 -
 calendar/gui/e-meeting-store.c                             |  1 -
 calendar/gui/e-week-view.c                                 |  1 -
 calendar/gui/gnome-cal.c                                   |  1 -
 calendar/gui/memos-control.c                               |  1 -
 calendar/gui/tasks-control.c                               |  1 -
 e-util/ChangeLog                                           |  5 +++++
 e-util/e-dialog-utils.c                                    |  2 +-
 mail/ChangeLog                                             |  6 ++++++
 mail/em-folder-view.c                                      |  1 -
 mail/importers/mail-importer.c                             |  2 +-
 shell/ChangeLog                                            |  8 ++++++++
 shell/e-shell.c                                            |  1 -
 shell/evolution-shell-component-utils.c                    |  1 -
 shell/importer/intelligent.c                               |  1 -
 shell/main.c                                               |  1 -
 widgets/ChangeLog                                          |  6 ++++++
 widgets/menus/gal-view-collection.c                        |  1 -
 widgets/menus/gal-view-instance.c                          |  1 -
 30 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 14cad13c37..f8b64c868e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/contact-editor/e-contact-editor-fullname.c:
+	* gui/contact-editor/e-contact-editor-im.c:
+	* gui/contact-editor/e-contact-editor-address.c:
+	* gui/widgets/e-addressbook-view.c:
+	* printing/e-contact-print.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
 2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/component/addressbook-view.c:
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index be8c75e636..111dfe3bca 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -26,7 +26,6 @@
 #include <e-util/e-util-private.h>
 
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <misc/e-gui-utils.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index db7030e98b..3eeaa9d6ed 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -23,7 +23,6 @@
 #include <config.h>
 #include "e-contact-editor-fullname.h"
 #include <e-util/e-util-private.h>
-#include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
 
 static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c
index cc4fcc5d05..65a70f432b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-im.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-im.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include "e-contact-editor-im.h"
-#include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <e-util/e-util-private.h>
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index dc0b234745..3b1fd8191c 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <table/e-table-scrolled.h>
 #include <table/e-table-model.h>
 #include <misc/e-gui-utils.h>
@@ -554,7 +553,8 @@ init_collection (void)
 
 		gal_view_collection_set_title (collection, _("Address Book"));
 
-		galview = gnome_util_prepend_user_home("/.evolution/addressbook/views");
+		galview = g_build_filename (
+			e_get_user_data_dir (), "addressbook", "views", NULL);
 		addressbookdir = g_build_filename (EVOLUTION_GALVIEWSDIR,
 						   "addressbook",
 						   NULL);
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 23abe184ca..0ba9dbb71a 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -29,7 +29,6 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
-#include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index af8b6c5b0c..d1ec1d02f9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/calendar-commands.c:
+	* gui/e-cal-list-view.c:
+	* gui/e-day-view.c:
+	* gui/e-itip-control.c:
+	* gui/e-meeting-list-view.c:
+	* gui/e-meeting-store.c:
+	* gui/e-week-view.c:
+	* gui/gnome-cal.c:
+	* gui/memos-control.c:
+	* gui/tasks-control.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
 2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/calendar-commands.c:
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 80554167b6..fd2bdbef88 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -37,7 +37,6 @@
 #include <errno.h>
 
 #include <gtk/gtk.h>
-#include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-exception.h>
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 6534a562f0..cc9ae353cd 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -43,7 +43,6 @@
 #include <misc/e-popup-menu.h>
 #include <misc/e-cell-date-edit.h>
 #include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
 #include <e-util/e-categories-config.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-util-private.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 331b3a4132..05f4d1ca64 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -39,7 +39,6 @@
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
 #include <e-util/e-categories-config.h>
 #include <e-util/e-dialog-utils.h>
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 16be20add4..bf8ceec3be 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -31,7 +31,6 @@
 #include <unistd.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
 #include <gtkhtml/gtkhtml.h>
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index d1613fd6df..95bdcdff19 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -31,7 +31,6 @@
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-exception.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <libebook/e-book.h>
 #include <libebook/e-vcard.h>
 #include <libecal/e-cal-component.h>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index e8788f0454..663de70ba8 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -27,7 +27,6 @@
 
 #include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index e752f6d55e..6d95770d16 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -36,7 +36,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-exec.h>
-#include <libgnome/gnome-util.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <text/e-text.h>
 #include <misc/e-canvas-utils.h>
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 32a2a4c746..dcec360953 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -36,7 +36,6 @@
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-exception.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-url.h>
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 3f6c1ea7d0..8e5eaf23b2 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -29,7 +29,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 07cff52a84..58d30ec05e 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -27,7 +27,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 1d0bfb62ad..a23eb07533 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-dialog-utils.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
 2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	* e-util.c (e_display_help):
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index ecf9e7ec1e..a3bde484d5 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -27,6 +27,7 @@
 
 #include "e-dialog-utils.h"
 
+#include <errno.h>
 #include <unistd.h>
 #include <glib/gstdio.h>
 
@@ -36,7 +37,6 @@
 
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-error.h"
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5d9998b728..13eea3ba5b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* em-folder-view.c:
+	* importers/mail-importer.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
 2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	* mail-autofilter.c:
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index e7ae0d637d..d341f4cec6 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -29,7 +29,6 @@
 
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-util.h>
 
 #ifdef G_OS_WIN32
 /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 62ae1ca4e0..44db11fb56 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/types.h>
@@ -36,7 +37,6 @@
 #include <glib/gstdio.h>
 
 #include <gmodule.h>
-#include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-store.h>
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 0d3425de44..eed506e83f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-shell.c:
+	* evolution-shell-component-utils.c:
+	* importer/intelligent.c:
+	* main.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
 2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
 
 	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index aeb6b79112..a512442133 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -43,7 +43,6 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 
 #include <gconf/gconf-client.h>
 
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index 7400cb23c4..9dc1c3323b 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -29,7 +29,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-moniker-util.h>
 #include <bonobo/bonobo-exception.h>
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index c7cb6b3b0c..6503fc8ad6 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 #include <libgnome/gnome-config.h>
-/*#include <libgnome/gnome-util.h>*/
 #include <glib/gi18n.h>
 
 #include <bonobo/bonobo-object.h>
diff --git a/shell/main.c b/shell/main.c
index 1638de0788..3590c315c4 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -51,7 +51,6 @@
 #include <gconf/gconf-client.h>
 
 #include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
 #include <libgnome/gnome-sound.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-client.h>
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index e7a12a4341..71810c617c 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	* menus/gal-view-collection.c:
+	* menus/gal-view-instance.c:
+	Remove unneeded #include <libgnome/gnome-util.h>.
+
 2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #567276
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 57c06eba16..890ee3ea7f 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -28,7 +28,6 @@
 
 #include <glib.h>
 #include <libxml/parser.h>
-#include <libgnome/gnome-util.h>
 #include <libedataserver/e-xml-utils.h>
 
 #include <glib/gi18n.h>
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index e31c7d1079..a1eac04b6c 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -31,7 +31,6 @@
 
 #include <gtk/gtk.h>
 #include <libxml/parser.h>
-#include <libgnome/gnome-util.h>
 #include <glib/gstdio.h>
 #include <libedataserver/e-xml-utils.h>
 #include <libedataserver/e-data-server-util.h>
-- 
cgit v1.2.3