diff options
author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
commit | 4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch) | |
tree | d16ce30e77dd539c03509237dd4c723d46aea97a /shell/e-shell.c | |
parent | 5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff) | |
parent | 19163c2b71e6128fc9b32287b99b1f4422324c2d (diff) | |
download | gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2 gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip |
Merge from master
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r-- | shell/e-shell.c | 12 |
1 files changed, 9 insertions, 3 deletions
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; |