Attachment #174413 for bug #250031

View | Details | Raw Unified | Return to bug 250031
Collapse All | Expand All




	object_class->finalize = downloader_view_finalize;

	g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate));

#ifdef HAVE_LIBNOTIFY
	notify_init (PACKAGE);
#endif

}

static void


	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);

Lines 50-55 Link Here

(-)a/src/ephy-main.c (+13 lines)
50	#include <errno.h>	50	#include <errno.h>
51	#include <string.h>	51	#include <string.h>
52		52
		53	#ifdef HAVE_LIBNOTIFY
		54	#include <libnotify/notify.h>
		55	#endif
		56
53	static GQuark startup_error_quark = 0;	57	static GQuark startup_error_quark = 0;
54	#define STARTUP_ERROR_QUARK (startup_error_quark)	58	#define STARTUP_ERROR_QUARK (startup_error_quark)
55		59
Lines 737-745 main (int argc, Link Here
737	g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL);	741	g_object_weak_ref (G_OBJECT (ephy_shell), shell_weak_notify, NULL);
738	ephy_object_idle_unref (ephy_shell);	742	ephy_object_idle_unref (ephy_shell);
739		743
		744	#ifdef HAVE_LIBNOTIFY
		745	/* Init notifications for the download manager */
		746	notify_init (PACKAGE);
		747	#endif
		748
740	gtk_main ();	749	gtk_main ();
741		750
742	/* Shutdown */	751	/* Shutdown */
		752	#ifdef HAVE_LIBNOTIFY
		753	if (notify_is_initted ())
		754	notify_uninit ();
		755	#endif
743	eel_gconf_monitor_remove ("/apps/epiphany/general");	756	eel_gconf_monitor_remove ("/apps/epiphany/general");
744	gnome_accelerators_sync ();	757	gnome_accelerators_sync ();
745	ephy_state_save ();	758	ephy_state_save ();

Return to bug 250031

Lines 141-151 downloader_view_class_init (DownloaderViewClass *klass) Link Here

(-)a/embed/downloader-view.c (-12 lines)
141	object_class->finalize = downloader_view_finalize;	141	object_class->finalize = downloader_view_finalize;
142		142
143	g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate));	143	g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate));
144
145	#ifdef HAVE_LIBNOTIFY
146	notify_init (PACKAGE);
147	#endif
148
149	}	144	}
150		145
151	static void	146	static void
Lines 289-301 downloader_view_finalize (GObject *object) Link Here
289		284
290	G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object);	285	G_OBJECT_CLASS (downloader_view_parent_class)->finalize (object);
291		286
292	#ifdef HAVE_LIBNOTIFY
293	if (notify_is_initted ())
294	{
295	notify_uninit ();
296	}
297	#endif
298
299	if (idle_unref)	287	if (idle_unref)
300	{	288	{
301	ephy_object_idle_unref (embed_shell);	289	ephy_object_idle_unref (embed_shell);