Merge from master

11 files changed, 28 insertions, 34 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 2b312038ba..ad9a0bb308 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -61,9 +61,8 @@ libeshell_la_CPPFLAGS =						\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(EGG_SMCLIENT_CFLAGS)					\
-	$(CLUTTER_CFLAGS)					\
-	$(TZDIALOG_CFLAGS)					\
-	$(SHELL_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CLUTTER_CFLAGS)
 
 libeshell_la_SOURCES =				\
 	$(eshellinclude_HEADERS)		\
@@ -99,8 +98,7 @@ libeshell_la_LIBADD =					\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(EGG_SMCLIENT_LIBS)				\
-	$(CLUTTER_LIBS)					\
-	$(SHELL_LIBS)
+	$(CLUTTER_LIBS)
 
 # Evolution executable
 
@@ -131,10 +129,10 @@ evolution_CPPFLAGS =						\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
 	-DDATADIR=\""$(datadir)"\"				\
 	-DLIBDIR=\""$(datadir)"\"				\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)				\
-	$(TZDIALOG_CFLAGS)					\
-	$(CLUTTER_CFLAGS)					\
-	$(SHELL_CFLAGS)
+	$(GTKHTML_CFLAGS)					\
+	$(CLUTTER_CFLAGS)
 
 evolution_SOURCES =				\
 	main.c
@@ -146,8 +144,7 @@ evolution_LDADD =							\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/filter/libfilter.la				\
-	$(TZDIALOG_LIBS)						\
-	$(SHELL_LIBS)							\
+	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(CLUTTER_LIBS)							\
 	$(EVOLUTIONICON)
diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 3364b16589..ae600bac3d 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -22,9 +22,10 @@
 #ifndef E_SHELL_BACKEND_H
 #define E_SHELL_BACKEND_H
 
+#include <libebackend/e-extension.h>
+
 #include <shell/e-shell-common.h>
 #include <e-util/e-activity.h>
-#include <e-util/e-extension.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_BACKEND \
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index a109ffb4a7..c7a41510f2 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -32,12 +32,11 @@
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-alert-dialog.h"
-#include "e-util/e-alert-sink.h"
-#include "e-util/e-extensible.h"
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
+#include "e-util/e-alert-sink.h"
 #include "filter/e-rule-editor.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-alert-bar.h"
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index e0c10c656a..13b0b49349 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -32,9 +32,9 @@
 #include "e-shell-searchbar.h"
 
 #include <glib/gi18n-lib.h>
+#include <libebackend/e-extensible.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-extensible.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-hinted-entry.h"
 
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index abe37b7cbd..62652dee1f 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -31,8 +31,9 @@
 
 #include "e-shell-sidebar.h"
 
+#include <libebackend/e-extensible.h>
+
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-unicode.h>
 #include <shell/e-shell-view.h>
 
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 1bfe01ef25..77c1fd2929 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -32,7 +32,7 @@
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
-#include <e-util/e-extensible.h>
+#include <libebackend/e-extensible.h>
 
 #define H_PADDING 6
 #define V_PADDING 6
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 1ddbd357e0..adc0d27980 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -31,9 +31,9 @@
 
 #include "e-shell-taskbar.h"
 
-#include <e-shell-view.h>
+#include <libebackend/e-extensible.h>
 
-#include <e-util/e-extensible.h>
+#include <e-shell-view.h>
 #include <misc/e-activity-proxy.h>
 
 struct _EShellTaskbarPrivate {
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 49e05baf36..370aa90403 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -33,8 +33,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
+#include <libebackend/e-extensible.h>
 
-#include "e-util/e-extensible.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-ui-manager.h"
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 6a9744d971..d36a3e64f6 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -28,12 +28,12 @@
 #include <glib/gi18n.h>
 
 #include <gconf/gconf-client.h>
+#include <libebackend/e-extensible.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-alert-dialog.h>
 #include <e-util/e-alert-sink.h>
-#include <e-util/e-extensible.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/gconf-bridge.h>
 #include <widgets/misc/e-alert-bar.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index dbcb55b36a..7ef48c2149 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,12 +32,12 @@
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
+#include <libebackend/e-module.h>
+#include <libebackend/e-extensible.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "e-util/e-module.h"
-#include "e-util/e-extensible.h"
-#include "e-util/e-util-private.h"
 #include "e-util/e-util.h"
+#include "e-util/e-util-private.h"
 #include "smclient/eggsmclient.h"
 #include "widgets/misc/e-preferences-window.h"
 
@@ -747,6 +747,12 @@ shell_dispose (GObject *object)
 		g_object_unref (alert);
 	}
 
+	while ((alert = g_queue_pop_head (&priv->alerts)) != NULL) {
+		g_signal_handlers_disconnect_by_func (
+			alert, shell_alert_response_cb, object);
+		g_object_unref (alert);
+	}
+
 	if (priv->startup_view != NULL) {
 		g_free (priv->startup_view);
 		priv->startup_view = NULL;
diff --git a/shell/main.c b/shell/main.c
index fd0b0508e6..bb056e3ded 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -27,10 +27,8 @@
 #include <glib/gstdio.h>
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
 #include <glib-unix.h>
 #endif
-#endif
 
 #if HAVE_CLUTTER
 #include <clutter-gtk/clutter-gtk.h>
@@ -271,7 +269,6 @@ idle_cb (const gchar * const *uris)
 }
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
 static gboolean
 handle_term_signal (gpointer data)
 {
@@ -287,7 +284,6 @@ handle_term_signal (gpointer data)
 	return FALSE;
 }
 #endif
-#endif
 
 static GOptionEntry entries[] = {
 #ifdef G_OS_WIN32
@@ -614,15 +610,9 @@ main (gint argc,
 	}
 
 #ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,19)
 	g_unix_signal_add_full (
 		G_PRIORITY_DEFAULT, SIGTERM,
 		handle_term_signal, NULL, NULL);
-#elif GLIB_CHECK_VERSION(2,29,5)
-	g_unix_signal_add_watch_full (
-		SIGTERM, G_PRIORITY_DEFAULT,
-		handle_term_signal, NULL, NULL);
-#endif
 #endif
 
 	if (evolution_debug_log) {