aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--embed/downloader-view.c12
-rw-r--r--src/ephy-main.c13
2 files changed, 13 insertions, 12 deletions
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index a5e59eed9..067477adc 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -138,11 +138,6 @@ downloader_view_class_init (DownloaderViewClass *klass)
object_class->finalize = downloader_view_finalize;
g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate));
-
-#ifdef HAVE_LIBNOTIFY
- notify_init (PACKAGE);
-#endif
-
}
static void
@@ -284,13 +279,6 @@ downloader_view_finalize (GObject *object)
G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object);
-#ifdef HAVE_LIBNOTIFY
- if (notify_is_initted ())
- {
- notify_uninit ();
- }
-#endif
-
if (idle_unref)
{
ephy_object_idle_unref (embed_shell);
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 0beebf939..1850ffbb4 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -50,6 +50,10 @@
#include <errno.h>
#include <string.h>
+#ifdef HAVE_LIBNOTIFY
+#include <libnotify/notify.h>
+#endif
+
static GQuark startup_error_quark = 0;
#define STARTUP_ERROR_QUARK (startup_error_quark)
@@ -714,9 +718,18 @@ main (int argc,
g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL);
ephy_object_idle_unref (ephy_shell);
+#ifdef HAVE_LIBNOTIFY
+ /* Init notifications for the download manager */
+ notify_init (PACKAGE);
+#endif
+
gtk_main ();
/* Shutdown */
+#ifdef HAVE_LIBNOTIFY
+ if (notify_is_initted ())
+ notify_uninit ();
+#endif
eel_gconf_monitor_remove ("/apps/epiphany/general");
gnome_accelerators_sync ();
ephy_state_save ();