evolution-rss r327 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Jul  1 16:15:03 2008
New Revision: 327
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=327&view=rev

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

* fix old gecko shutdown issue
* fix building with firefox-devel

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/rss.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jul  1 16:15:03 2008
@@ -201,7 +201,10 @@
 		GECKO_RPATH="-Wl,--rpath -Wl,"$GECKO_LIBDIR
 		GECKO_HOME=$GECKO_LIBDIR
 		AC_SUBST([GECKO_RPATH])
-	
+			if text "x$GECKO" == "xfirefox"; then
+			AC_DEFINE_UNQUOTED(HAVE_BUGGY_GECKO, 1, [workarund for a bug in shutdown gecko])
+			AC_SUBST(HAVE_BUGGY_GECKO)
+			fi
 			if test "x$GECKO" == "xxulrunner"; then
 			AC_DEFINE_UNQUOTED(HAVE_XULRUNNER, 1, [gecko flavour is xulrunner])
 			AC_SUBST(HAVE_XULRUNNER)

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Jul  1 16:15:03 2008
@@ -3234,7 +3234,19 @@
 	g_print(".done\n");
 	if (rf->mozembed)
 		gtk_widget_destroy(rf->mozembed);
+
+	guint render = GPOINTER_TO_INT(
+		gconf_client_get_int(rss_gconf, 
+			GCONF_KEY_HTML_RENDER, 
+			NULL));
+	//really find a better way to deal with this//
+	//I do not know how to shutdown gecko (gtk_moz_embed_pop_startup)
+	//crash in nsCOMPtr_base::assign_with_AddRef
+	if (2 == render)
+		system("killall -SIGTERM evolution")
+#else
 	gecko_shutdown();
+#endif
 }
 
 guint