evolution-rss r259 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon May  5 05:35:06 2008
New Revision: 259
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=259&view=rev

Log:
libxul fixes

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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Mon May  5 05:35:06 2008
@@ -41,3 +41,4 @@
 	* disable browser alerts messages
 	* make cancel all button work
 	* add debug points for showing steps of current operation
+	* check libsoup 2.2 fallback

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon May  5 05:35:06 2008
@@ -183,7 +183,7 @@
 	fi
 AC_SUBST([GECKO_CFLAGS])
 AC_SUBST([GECKO_LIBS])
-		if test "x$have_gecko" != "xno"; then
+		#if test "x$have_gecko" != "xno"; then
 		AC_DEFINE_UNQUOTED(HAVE_RENDERKIT,1, [either webkit or gtkmozemebed render engines are present])
 		AC_DEFINE_UNQUOTED(HAVE_GTKMOZEMBED,1, [gtkmozembed render engine present])
 		AC_SUBST(HAVE_RENDERKIT)
@@ -202,7 +202,7 @@
 			AC_DEFINE_UNQUOTED(HAVE_LIBXUL, 1, [libxul flavour of xulrunner])
 			AC_SUBST(HAVE_LIBXUL)
 			fi
-		fi
+		#fi
 		AC_ARG_WITH([primary-render],
         		AS_HELP_STRING([--with-primary-render],[Forces Gecko to be the primary html renderer  @<:@=gecko|webkit@:>@ (default:gtkHTML)]),
         			[RENDER=$with_primary_render], [RENDER=gtkhtml])

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon May  5 05:35:06 2008
@@ -84,23 +84,12 @@
 #include <libxml/HTMLparser.h>
 
 #ifdef HAVE_RENDERKIT
-
-#ifndef XPCOM_GLUE
-#  define MOZILLA_INTERNAL_API
-#endif
-
-#ifdef XPCOM_GLUE
-#  include <gtkmozembed_glue.cpp>
-#endif
-
 #ifdef HAVE_GTKMOZEMBED
-//#ifdef HAVE_LIBXUL
-//#include <gtkembedmoz/gtkmozembed.h>
+#ifdef HAVE_LIBXUL
 #include <gtkmozembed.h>
-//#include <gtkmozembed_internal.h>
-//#else
-//#include <gtkmozembed.h>
-//#endif
+#else
+#include <gtkembedmoz/gtkmozembed.h>
+#endif
 #endif
 
 #ifdef HAVE_OLD_WEBKIT
@@ -1541,41 +1530,6 @@
        	g_setenv("MOZILLA_FIVE_HOME", GECKO_HOME, 1);
 	g_unsetenv("MOZILLA_FIVE_HOME");
 
-#ifdef XPCOM_GLUE
-    static const GREVersionRange greVersion = {
-    "1.9a", PR_TRUE,
-    "2", PR_TRUE
-    };
-    char xpcomLocation[4096];
-    nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
-    if (NS_FAILED(rv)) {
-       printf("failed 1\n");
-       return;
-    }
-
-    // Startup the XPCOM Glue that links us up with XPCOM.
-    XPCOMGlueStartup(xpcomLocation);
-    if (NS_FAILED(rv)) {
-        printf("failed 2\n");
-        return;
-    }
-    printf("before 3\n");
-
-    rv = GTKEmbedGlueStartup();
-    if (NS_FAILED(rv)) {
-        printf("failed 3\n");
-        return;
-    }
-
-    //gtk_moz_embed_set_comp_path(xpcomLocation);
-
-    char *lastSlash = strrchr(xpcomLocation, '/');
-    if (lastSlash)
-      *lastSlash = '\0';
-
-    gtk_moz_embed_set_path(xpcomLocation);
-#endif
-
 // this means xulrunner at least 1.9
 #ifdef HAVE_LIBXUL
 	gtk_moz_embed_set_path(GECKO_HOME);
@@ -1849,6 +1803,7 @@
 	if (rf->cur_format || (feedid && is_html && rf->cur_format))
 	{
 		guint engine = fallback_engine();
+#ifdef HAVE_RENDERKIT
 		if (engine && engine != 10)
 		{ 
         		char *classid = g_strdup_printf ("org-gnome-rss-controls-%d",
@@ -1863,6 +1818,7 @@
 				"<table><tr><td width=100%% valign=top><object classid=%s></object></td></tr></table>\n", classid);
 			goto out;
 		}
+#endif
 		content = net_post_blocking(addr, NULL, NULL, textcb, NULL, &err);
 		if (err)
         	{