r16746 - in /desktop/unstable/epiphany-browser/debian: changelog patches/16_fix-notify-uninit-crash.patch patches/series

[samm-guest at users.alioth.debian.org]

Author: samm-guest
Date: Sat Aug  9 11:31:03 2008
New Revision: 16746

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16746
Log:
16_fix-notify-uninit-crash.patch: fix crash on amd64 systems when
downloads complete (closes: #492143).

Added:
    desktop/unstable/epiphany-browser/debian/patches/16_fix-notify-uninit-crash.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=16746&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sat Aug  9 11:31:03 2008
@@ -15,7 +15,11 @@
     - Only pass --enable-network-manager to configure if DEB_HOST_ARCH_OS is
       linux.
 
- -- Josselin Mouette <joss at debian.org>  Wed, 16 Jul 2008 11:44:49 +0200
+  [ Sam Morris ]
+  * 16_fix-notify-uninit-crash.patch: fix crash on amd64 systems when
+    downloads complete (closes: #492143).
+
+ -- Sam Morris <sam at robots.org.uk>  Sat, 09 Aug 2008 12:08:36 +0100
 
 epiphany-browser (2.22.3-1) unstable; urgency=low
 

Added: desktop/unstable/epiphany-browser/debian/patches/16_fix-notify-uninit-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/16_fix-notify-uninit-crash.patch?rev=16746&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/16_fix-notify-uninit-crash.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/16_fix-notify-uninit-crash.patch Sat Aug  9 11:31:03 2008
@@ -1,0 +1,65 @@
+3cc902d2fd203127a98e027f42175db35dafa579
+Index: epiphany-2.22.3/embed/downloader-view.c
+===================================================================
+--- epiphany-2.22.3.orig/embed/downloader-view.c	2008-06-30 19:08:27.000000000 +0100
++++ epiphany-2.22.3/embed/downloader-view.c	2008-08-09 12:08:17.000000000 +0100
+@@ -153,11 +153,6 @@
+ 	object_class->finalize = downloader_view_finalize;
+ 
+ 	g_type_class_add_private (object_class, sizeof(DownloaderViewPrivate));
+-
+-#ifdef HAVE_LIBNOTIFY
+-	notify_init (PACKAGE);
+-#endif
+-
+ }
+ 
+ static void
+@@ -301,13 +296,6 @@
+ 
+ 	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);
+Index: epiphany-2.22.3/src/ephy-main.c
+===================================================================
+--- epiphany-2.22.3.orig/src/ephy-main.c	2008-08-09 12:06:28.000000000 +0100
++++ epiphany-2.22.3/src/ephy-main.c	2008-08-09 12:08:17.000000000 +0100
+@@ -52,6 +52,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)
+ 
+@@ -741,9 +745,18 @@
+ 	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 ();

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=16746&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Sat Aug  9 11:31:03 2008
@@ -13,4 +13,5 @@
 12_safetypes.patch
 13_extensions_need_xpcom.patch
 15_certificates_oldapi.patch
+16_fix-notify-uninit-crash.patch 
 99_autoreconf.patch