evolution-rss r328 - in trunk: . pixmaps src

[lucilanga svn gnome org]

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

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

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

Modified:
   trunk/Makefile.in
   trunk/config.h.in
   trunk/pixmaps/Makefile.in
   trunk/src/Makefile.in
   trunk/src/rss.c

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Tue Jul  1 16:18:11 2008
@@ -136,6 +136,7 @@
 GPP = @GPP@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
+HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@
 HAVE_GECKO_1_9 = @HAVE_GECKO_1_9@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Tue Jul  1 16:18:11 2008
@@ -15,6 +15,9 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
+/* workarund for a bug in shutdown gecko */
+#undef HAVE_BUGGY_GECKO
+
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 

Modified: trunk/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Tue Jul  1 16:18:11 2008
@@ -117,6 +117,7 @@
 GPP = @GPP@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
+HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@
 HAVE_GECKO_1_9 = @HAVE_GECKO_1_9@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Tue Jul  1 16:18:11 2008
@@ -171,6 +171,7 @@
 GPP = @GPP@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
+HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@
 HAVE_GECKO_1_9 = @HAVE_GECKO_1_9@
 HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Jul  1 16:18:11 2008
@@ -3242,6 +3242,7 @@
 	//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
+#ifdef HAVE_BUGGY_GECKO
 	if (2 == render)
 		system("killall -SIGTERM evolution")
 #else