r1100 - in /unstable/evolution-rss/debian: changelog patches/64_glue-shutdown.patch patches/64_xul-crash.patch patches/99_autoconf.patch

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

Author: ember-guest
Date: Sat Jul 26 18:09:13 2008
New Revision: 1100

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1100
Log:
* debian/patches/64_glue-shutdown.patch:
  - Prevent evolution segfaulting on exit and clean glue (Closes: #491703)

Added:
    unstable/evolution-rss/debian/patches/64_glue-shutdown.patch
Removed:
    unstable/evolution-rss/debian/patches/64_xul-crash.patch
    unstable/evolution-rss/debian/patches/99_autoconf.patch
Modified:
    unstable/evolution-rss/debian/changelog

Modified: unstable/evolution-rss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/changelog?rev=1100&op=diff
==============================================================================
--- unstable/evolution-rss/debian/changelog (original)
+++ unstable/evolution-rss/debian/changelog Sat Jul 26 18:09:13 2008
@@ -1,12 +1,9 @@
 evolution-rss (0.1.0-2) UNRELEASED; urgency=low
 
-  * debian/patches/64_xul-crash.patch:
-    - Ugly workaround to prevent evolution segfaulting
-      on exit (Closes: #491703)
+  * debian/patches/64_glue-shutdown.patch:
+    - Prevent evolution segfaulting on exit and clean glue (Closes: #491703)
   * debian/patches/65_firefox-import.patch:
     - Fix importing feeds from firefox
-  * debian/patches/99_autoconf.patch:
-    - To apply the changes
 
  -- Pedro Fragoso <ember at ubuntu.com>  Tue, 22 Jul 2008 03:12:46 +0100
 

Added: unstable/evolution-rss/debian/patches/64_glue-shutdown.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-rss/debian/patches/64_glue-shutdown.patch?rev=1100&op=file
==============================================================================
--- unstable/evolution-rss/debian/patches/64_glue-shutdown.patch (added)
+++ unstable/evolution-rss/debian/patches/64_glue-shutdown.patch Sat Jul 26 18:09:13 2008
@@ -1,0 +1,24 @@
+--- src/gecko-utils.cpp	(revision 342)
++++ src/gecko-utils.cpp	(working copy)
+@@ -39,6 +39,7 @@
+ #include <nsIPrefService.h>
+ #include <nsIServiceManager.h>
+ #include <nsServiceManagerUtils.h>
++#include <nspr.h>
+ 
+ static nsIPrefBranch* gPrefBranch;
+ 
+@@ -97,7 +98,13 @@
+ 	NS_IF_RELEASE (gPrefBranch);
+ 	gPrefBranch = nsnull;
+ 
++#ifdef XPCOM_GLUE
++	XPCOMGlueShutdown();
++	NS_ShutdownXPCOM (nsnull);
++	PR_ProcessExit (0);
++#else
+ 	gtk_moz_embed_pop_startup ();
++#endif
+ 
+ #ifdef HAVE_GECKO_1_9
+         NS_LogTerm ();