From 5f55aba5b052fb7284973f50009f8b369334d084 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 1 May 2009 06:44:36 -0400
Subject: Merge in changes from master.

---
 plugins/backup-restore/backup-restore.c          | 3 ++-
 plugins/backup-restore/backup.c                  | 3 ++-
 plugins/groupwise-features/install-shared.c      | 4 ++--
 plugins/groupwise-features/junk-settings.c       | 2 --
 plugins/groupwise-features/proxy.c               | 2 --
 plugins/groupwise-features/share-folder-common.c | 1 -
 plugins/groupwise-features/share-folder.c        | 2 --
 plugins/ipod-sync/sync.c                         | 3 ++-
 plugins/mail-notification/mail-notification.c    | 6 +-----
 plugins/startup-wizard/startup-wizard.c          | 5 ++++-
 10 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'plugins')

diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 400dd85898..5d4a911c9a 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -31,7 +31,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeui/gnome-druid.h>
+#include <libgnomeui/gnome-druid-page-standard.h>
 #include "shell/es-menu.h"
 #include "mail/em-config.h"
 #include "mail/em-account-editor.h"
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 39ed4de4a9..99d7f8d41f 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -29,7 +29,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-util.h>
 
 #include <libebook/e-book.h>
 #include <libecal/e-cal.h>
@@ -439,6 +438,8 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
+	g_thread_init (NULL);
+
 	gtk_init_with_args (
 		&argc, &argv, NULL, options, GETTEXT_PACKAGE, &error);
 	if (error != NULL) {
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 35e3ae6c68..2f60b34bff 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -26,9 +26,9 @@
 
 #include <string.h>
 #include <glib.h>
-#include <gnome.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeui/gnome-druid.h>
+#include <libgnomeui/gnome-druid-page-edge.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-config.h>
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 460883a61a..bff2abc35a 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -26,8 +26,6 @@
 #include <glade/glade.h>
 #include "junk-settings.h"
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnome/gnome-init.h>
 #include <glib/gi18n.h>
 #include <e-util/e-error.h>
 #include <e-util/e-util-private.h>
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index a7eed9b963..8bf212ee24 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -31,8 +31,6 @@
 
 #include <libedataserverui/e-contact-store.h>
 
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnome/gnome-init.h>
 #include <e-util/e-error.h>
 #include <e-util/e-util-private.h>
 #include <e-gw-container.h>
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index cdea5a7265..0b811d0787 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -48,7 +48,6 @@
 #include <e-gw-container.h>
 #include <e-gw-connection.h>
 #include <glade/glade.h>
-#include <libgnomeui/libgnomeui.h>
 #include "share-folder.h"
 #define d(x)
 
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 87d6564f0e..d16c205758 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -27,8 +27,6 @@
 #include "share-folder.h"
 #include <glib/gi18n-lib.h>
 #include <libedataserverui/e-contact-store.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnome/gnome-init.h>
 #include <e-util/e-error.h>
 #include <e-util/e-util-private.h>
 #include <e-gw-container.h>
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index 1da7ecd983..a444af1bd9 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -20,8 +20,9 @@
 
 #include "config.h"
 #include "evolution-ipod-sync.h"
-#include <gnome.h>
 
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <libecal/e-cal.h>
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 89f9daaccb..5bb65cef18 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -29,7 +29,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
-#include <libgnome/libgnome.h>
+#include <libgnome/gnome-sound.h>
 
 #ifdef HAVE_DBUS
 #include <dbus/dbus-glib.h>
@@ -54,10 +54,6 @@
 #define GCONF_KEY_ENABLED_STATUS 	GCONF_KEY_ROOT "status-enabled"
 #define GCONF_KEY_ENABLED_SOUND	 	GCONF_KEY_ROOT "sound-enabled"
 
-#if !GTK_CHECK_VERSION(2,16,0)
-#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip
-#endif
-
 static gboolean enabled = FALSE;
 static GtkWidget *get_cfg_widget (void);
 static GStaticMutex mlock = G_STATIC_MUTEX_INIT;
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index 6289a63489..34d5961d4b 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -20,10 +20,13 @@
  *
  */
 
+#include <unistd.h>
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnomeui/libgnomeui.h>
+#include <libgnomeui/gnome-druid.h>
+#include <libgnomeui/gnome-druid-page-edge.h>
+#include <libgnomeui/gnome-druid-page-standard.h>
 #include "e-util/e-error.h"
 #include "e-util/e-import.h"
 #include "shell/es-event.h"
-- 
cgit