evolution-rss r232 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Sat Mar 29 20:25:02 2008
New Revision: 232
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=232&view=rev

Log:
xulrunner 1.9 (libxul) support

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/rss.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Mar 29 20:25:02 2008
@@ -3,6 +3,7 @@
 	-I$(EVOLUTION_SOURCE)					\
 	-I$(top_srcdir)						\
 	$(GECKO_CFLAGS)						\
+	-I$(GECKO_INCLUDE_ROOT)					\
 	$(WEBKIT_CFLAGS)					\
 	$(DBUS_CFLAGS)						\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""		\

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Sat Mar 29 20:25:02 2008
@@ -85,8 +85,12 @@
 #ifdef HAVE_RENDERKIT
 
 #ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_LIBXUL
+#include <gtkembedmoz/gtkmozembed.h>
+#else
 #include <gtkmozembed.h>
 #endif
+#endif
 
 #ifdef HAVE_OLD_WEBKIT
 #include "webkitgtkglobal.h"
@@ -1512,7 +1516,7 @@
 				gtk_widget_set_size_request((GtkWidget *)data, width, height);
 // apparently resizing gtkmozembed widget won't redraw if using xulrunner
 // there is no point in reload for the rest
-#ifdef HAVE_XULRUNNER
+#if defined(HAVE_XULRUNNER) || defined(HAVE_LIBXUL)
 				gtk_moz_embed_reload(rf->mozembed, GTK_MOZ_EMBED_FLAG_RELOADNORMAL);
 #endif
 			}
@@ -1527,7 +1531,13 @@
        	g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
 	g_unsetenv("MOZILLA_FIVE_HOME");
 
+// this means xulrunner at least 1.9
+#ifdef HAVE_LIBXUL
+	gtk_moz_embed_set_path(GECKO_HOME);
+#else
 	gtk_moz_embed_set_comp_path(GECKO_HOME);
+#endif
+
 	gchar *profile_dir = g_build_filename (g_get_home_dir (),
                                               ".evolution",
                                               "mail",