Merge commit 'origin/kill-bonobo'

4 files changed, 32 insertions, 19 deletions

diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index b26fa1693d..20fd6bf812 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -45,7 +45,6 @@ liborg_gnome_groupwise_features_la_LIBADD=			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/filter/libfilter.la			\
-	$(NO_UNDEFINED_REQUIRED_LIBS)				\
 	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(CAMEL_GROUPWISE_LIBS)
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 6dcbfe8d22..a208116f0a 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -27,8 +27,6 @@
 #include <string.h>
 #include <glib.h>
 #include <gtk/gtk.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>
@@ -154,7 +152,7 @@ accept_free(gpointer data)
 }
 
 static void
-accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
+apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
 {
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
@@ -165,6 +163,7 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 	accept_data = g_new0(struct AcceptData, 1);
 	model = mail_component_peek_tree_model (NULL);
 	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
+
 	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
 	uri = em_folder_tree_get_selected_uri(folder_tree);
 	em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
@@ -174,11 +173,10 @@ accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 	accept_data->model = model;
 	g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free);
 	g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
-	g_object_set_data_full((GObject *)dialog, "druid", druid, (GDestroyNotify)gtk_widget_destroy);
+	g_object_set_data_full((GObject *)dialog, "assistant", assistant, (GDestroyNotify)gtk_widget_destroy);
 	gtk_window_set_title (GTK_WINDOW (dialog), "Install Shared Folder");
 	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 	gtk_widget_show (dialog);
-
 }
 
 void
@@ -188,8 +186,6 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 	const gchar *name;
 	const gchar *email;
 	GtkWidget *window;
-	GnomeDruid *wizard;
-	GnomeDruidPageEdge *title_page;
 	CamelMimeMessage *msg = (CamelMimeMessage *) target->message;
 	CamelStreamMem *content;
 	CamelDataWrapper *dw;
@@ -216,20 +212,36 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 
 		from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message);
 		if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) {
+			GtkWidget *page;
+			GtkAssistant *assistant = GTK_ASSISTANT (gtk_assistant_new ());
+
 			start_message = g_strdup_printf (_("The user '%s' has shared a folder with you\n\n"
 							   "Message from '%s'\n\n\n"
 							   "%s\n\n\n"
-							   "Click 'Forward' to install the shared folder\n\n"),
+							   "Click 'Apply' to install the shared folder\n\n"),
 							   name, name, content->buffer->data);
-			title_page = GNOME_DRUID_PAGE_EDGE (gnome_druid_page_edge_new_with_vals(GNOME_EDGE_START, TRUE, _("Install the shared folder"), start_message, NULL, NULL, NULL));
-			g_free(start_message);
-			wizard = GNOME_DRUID (gnome_druid_new_with_window (_("Shared Folder Installation"), NULL, TRUE, (GtkWidget**)(&window)));
-			gtk_window_set_position (GTK_WINDOW (window) , GTK_WIN_POS_CENTER_ALWAYS);
-			gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));
-			gtk_widget_show_all (GTK_WIDGET (title_page));
-			camel_object_ref(msg);
-			g_object_set_data_full((GObject *)title_page, "msg", msg, camel_object_unref);
-			g_signal_connect (title_page, "next", G_CALLBACK(accept_clicked), msg);
+
+			page = gtk_label_new (start_message);
+			gtk_label_set_line_wrap (GTK_LABEL (page), TRUE);
+			gtk_misc_set_alignment (GTK_MISC (page), 0.0, 0.0);
+			gtk_misc_set_padding (GTK_MISC (page), 10, 10);
+
+			gtk_assistant_append_page (assistant, page);
+			gtk_assistant_set_page_title (assistant, page, _("Install the shared folder"));
+			gtk_assistant_set_page_type (assistant, page, GTK_ASSISTANT_PAGE_CONFIRM);
+			gtk_assistant_set_page_complete (assistant, page, TRUE);
+
+			gtk_window_set_title (GTK_WINDOW (assistant), _("Shared Folder Installation"));
+			gtk_window_set_position (GTK_WINDOW (assistant) , GTK_WIN_POS_CENTER_ALWAYS);
+
+			camel_object_ref (msg);
+			g_object_set_data_full((GObject *)page, "msg", msg, camel_object_unref);
+
+			g_signal_connect (assistant, "apply", G_CALLBACK (apply_clicked), msg);
+
+			gtk_widget_show_all (GTK_WIDGET (assistant));
+
+			g_free (start_message);
 		} else
 			g_warning ("Could not get the sender name");
 
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index b8fe49506b..123fc0641b 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -43,6 +43,7 @@
 #include <e-util/e-error.h>
 #include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
+#include <e-util/e-account-utils.h>
 
 #include <e-gw-container.h>
 #include <e-gw-connection.h>
@@ -303,7 +304,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 static void
 proxy_soap_login (gchar *email)
 {
-	EAccountList *accounts = mail_config_get_accounts();
+	EAccountList *accounts = e_get_account_list ();
 	EAccount *srcAccount;
 	EAccount *dstAccount;
 	EGwConnection *proxy_cnc, *cnc;
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index c9e8ffb572..791a2da541 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -382,6 +382,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data)
 
 	model = mail_component_peek_tree_model (mail_component_peek ());
 	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
+
 	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
 	uri = em_folder_tree_get_selected_uri(folder_tree);
 	em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);