evolution-rss r343 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Sat Jul 26 18:33:14 2008
New Revision: 343
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=343&view=rev

Log:
2008-07-26  Lucian Langa  <lucilanga gnome org>

* src/gecko-utils.cpp - shutdown buggy
gecko without sigterm

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/gecko-utils.cpp
   trunk/src/rss.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jul 26 18:33:14 2008
@@ -182,8 +182,6 @@
 		PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
 		dnl https://bugzilla.mozilla.org/show_bug.cgi?id=442009
 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags nspr)"
-		AC_DEFINE_UNQUOTED(HAVE_BUGGY_GECKO, 1, [workarund for a bug in shutdown gecko])
-		AC_SUBST(HAVE_BUGGY_GECKO)
 	elif test $GECKO = firefox; then
 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags firefox-xpcom)"
     		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])

Modified: trunk/src/gecko-utils.cpp
==============================================================================
--- trunk/src/gecko-utils.cpp	(original)
+++ trunk/src/gecko-utils.cpp	Sat Jul 26 18:33:14 2008
@@ -44,6 +44,8 @@
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>
 #include <nsServiceManagerUtils.h>
+#include <nspr.h>
+
 
 static nsIPrefBranch* gPrefBranch;
 
@@ -82,7 +84,7 @@
 #ifdef XPCOM_GLUE
        static const GREVersionRange greVersion = {
          "1.9a", PR_TRUE,
-         "1.9.*", PR_TRUE
+         "2", PR_TRUE
        };
        char xpcomLocation[4096];
        rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
@@ -153,7 +155,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 ();

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Sat Jul 26 18:33:14 2008
@@ -1635,11 +1635,6 @@
 #ifdef HAVE_GECKO
 	if (engine == 2)
 	{
-		if (!g_thread_supported ()) {
-                	g_thread_init (NULL);
-			gdk_threads_init();
-        	}
-
 		rf->mozembed = gtk_moz_embed_new();
 		render_set_preferences();