evolution-rss r335 - in trunk: . pixmaps src

From: lucilanga svn gnome org
To: svn-commits-list gnome org
Subject: evolution-rss r335 - in trunk: . pixmaps src
Date: Tue, 8 Jul 2008 19:00:18 +0000 (UTC)
Author: lucilanga
Date: Tue Jul  8 19:00:18 2008
New Revision: 335
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=335&view=rev

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

* configure.ac: rename HAVE_GTKMOZEMBED
to HAVE_GECKO reflect more generally
it's purpose
* configure.ac: fix --disable-gecko 
option

Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/Makefile.in
   trunk/config.h.in
   trunk/configure.ac
   trunk/pixmaps/Makefile.in
   trunk/src/Makefile.am
   trunk/src/Makefile.in
   trunk/src/rss-config-factory.c
   trunk/src/rss.c
   trunk/src/rss.h

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Tue Jul  8 19:00:18 2008
@@ -2,7 +2,7 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Tue Jul  8 19:00:18 2008
@@ -137,8 +137,8 @@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
 HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@
+HAVE_GECKO = @HAVE_GECKO@
 HAVE_GECKO_1_9 = @HAVE_GECKO_1_9@
-HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
 HAVE_XULRUNNER = @HAVE_XULRUNNER@

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Tue Jul  8 19:00:18 2008
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* gecko render engine present */
+#undef HAVE_GECKO
+
 /* Define if we have gecko 1.7 */
 #undef HAVE_GECKO_1_7
 
@@ -45,9 +48,6 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* gtkmozembed render engine present */
-#undef HAVE_GTKMOZEMBED
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jul  8 19:00:18 2008
@@ -181,55 +181,49 @@
 	if test $GECKO = libxul-embedding; then
 		PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
 		#GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
-		#GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
 	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])
+		AC_DEFINE_UNQUOTED(HAVE_BUGGY_GECKO, 1, [workarund for a bug in shutdown gecko])
+		AC_SUBST(HAVE_BUGGY_GECKO)
 	elif test $GECKO = libxul; then
     		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO >= $gecko_min_version])
 	else
     		PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
 	fi
-AC_SUBST([GECKO_CFLAGS])
-AC_SUBST([GECKO_LIBS])
-		#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)
-		AC_SUBST(HAVE_GTKMOZEMEBED)
+	AC_SUBST([GECKO_CFLAGS])
+	AC_SUBST([GECKO_LIBS])
+	AC_DEFINE_UNQUOTED(HAVE_RENDERKIT,1, [either webkit or gtkmozemebed render engines are present])
+	AC_DEFINE_UNQUOTED(HAVE_GECKO,1, [gecko render engine present])
+	AC_SUBST(HAVE_RENDERKIT)
+	AC_SUBST(HAVE_GECKO)
 #		RENDER_CFLAGS="$GECKO_CFLAGS -I$GECKO_INCLUDE_ROOT" 
 		RENDER_CFLAGS=$GECKO_CFLAGS 
 		GECKO_RPATH="-Wl,--rpath -Wl,"$GECKO_LIBDIR
 		GECKO_HOME=$GECKO_LIBDIR
 		AC_SUBST([GECKO_RPATH])
-			if test "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)
-			fi
-			if test "x$GECKO" == "xlibxul" -o "x$GECKO" == "xlibxul-embedding"; then
-			AC_DEFINE_UNQUOTED(HAVE_GECKO_1_9, 1, [at least gecko 1.9])
-			AC_SUBST(HAVE_GECKO_1_9)
-			fi
-		#fi
+	if test "x$GECKO" == "xxulrunner"; then
+		AC_DEFINE_UNQUOTED(HAVE_XULRUNNER, 1, [gecko flavour is xulrunner])
+		AC_SUBST(HAVE_XULRUNNER)
+	fi
+	if test "x$GECKO" == "xlibxul" -o "x$GECKO" == "xlibxul-embedding"; then
+		AC_DEFINE_UNQUOTED(HAVE_GECKO_1_9, 1, [at least gecko 1.9])
+		AC_SUBST(HAVE_GECKO_1_9)
+	fi
 #		_SAVE_CPPFLAGS="$CPPFLAGS"
 #               	CPPFLAGS="$CPPFLAGS $GECKO_CFLAGS"
-               	AC_MSG_CHECKING([[whether we have a xpcom glue]])
-               	AC_COMPILE_IFELSE(
-                       [AC_LANG_SOURCE(
-                               [[
+        AC_MSG_CHECKING([[whether we have a xpcom glue]])
+        AC_COMPILE_IFELSE(
+                 [AC_LANG_SOURCE(
+                       [[
                                  #ifndef XPCOM_GLUE
                                  #error "no xpcom glue found"
                                  #endif]]
                        )],
                        [gecko_cv_have_xpcom_glue=yes],
                        [gecko_cv_have_xpcom_glue=no])
-               	AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
+        AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
 #               	CPPFLAGS="$_SAVE_CPPFLAGS"
-               	AM_CONDITIONAL([HAVE_XPCOM_GLUE], [test "$gecko_cv_have_xpcom_glue" = "yes"])
 		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])
@@ -243,6 +237,8 @@
 		fi
 	fi
 fi
+AM_CONDITIONAL([HAVE_GECKO], [test "x$have_gecko" = "xyes"])
+AM_CONDITIONAL([HAVE_XPCOM_GLUE], [test "$gecko_cv_have_xpcom_glue" = "yes"])
 
 # *******************************
 # webkit renderer

Modified: trunk/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Tue Jul  8 19:00:18 2008
@@ -118,8 +118,8 @@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
 HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@
+HAVE_GECKO = @HAVE_GECKO@
 HAVE_GECKO_1_9 = @HAVE_GECKO_1_9@
-HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
 HAVE_XULRUNNER = @HAVE_XULRUNNER@

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jul  8 19:00:18 2008
@@ -19,9 +19,9 @@
 	$(EVOLUTION_RSS_EPLUGIN_CFLAGS)
 
  
-if ! HAVE_XPCOM_GLUE
-INCLUDES += -DGECKO_HOME=\""$(GECKO_HOME)"\"
-endif
+#if ! HAVE_XPCOM_GLUE
+#INCLUDES += -DGECKO_HOME=\""$(GECKO_HOME)"\"
+#endif
 
 RSS_MENU = \
 	<hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n		\
@@ -67,7 +67,13 @@
 	org-gnome-evolution-rss.xml
 plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
 
-liborg_gnome_evolution_rss_la_SOURCES = rss.c gecko-utils.cpp
+
+SOURCES = rss.c
+if HAVE_GECKO
+SOURCES+= gecko-utils.cpp
+endif
+
+liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
 liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
 
 evolution_import_rss_SOURCES = evolution-import-rss.c
@@ -125,16 +131,17 @@
 	network-soup.c				\
 	misc.c					\
 	dbus.c					\
-	rss-config-factory.c			\
-	rss-config-factory.h			\
 	gecko-utils.cpp				\
 	gecko-utils.h				\
+	rss-config-factory.c			\
+	rss-config-factory.h			\
 	evolution-import-rss.c			\
 	evolution-rss.schemas.in		\
 	org-gnome-evolution-rss.eplug.xml	\
 	org-gnome-evolution-rss.error.xml	\
 	org-gnome-evolution-rss.xml
 
+
 if HAVE_DBUS
 bin_PROGRAMS = \
 	evolution-import-rss

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Tue Jul  8 19:00:18 2008
@@ -34,7 +34,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
- HAVE_XPCOM_GLUE_FALSE@am__append_1 = -DGECKO_HOME=\""$(GECKO_HOME)"\"
+ HAVE_GECKO_TRUE@am__append_1 = gecko-utils.cpp
 @HAVE_DBUS_TRUE bin_PROGRAMS = evolution-import-rss$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -59,7 +59,10 @@
 pluginLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 liborg_gnome_evolution_rss_la_LIBADD =
-am_liborg_gnome_evolution_rss_la_OBJECTS = rss.lo gecko-utils.lo
+am__liborg_gnome_evolution_rss_la_SOURCES_DIST = rss.c gecko-utils.cpp
+ HAVE_GECKO_TRUE@am__objects_1 = gecko-utils.lo
+am__objects_2 = rss.lo $(am__objects_1)
+am_liborg_gnome_evolution_rss_la_OBJECTS = $(am__objects_2)
 liborg_gnome_evolution_rss_la_OBJECTS =  \
 	$(am_liborg_gnome_evolution_rss_la_OBJECTS)
 liborg_gnome_evolution_rss_la_LINK = $(LIBTOOL) --tag=CXX \
@@ -95,9 +98,7 @@
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(liborg_gnome_evolution_rss_la_SOURCES) \
-	$(evolution_import_rss_SOURCES)
-DIST_SOURCES = $(liborg_gnome_evolution_rss_la_SOURCES) \
+DIST_SOURCES = $(am__liborg_gnome_evolution_rss_la_SOURCES_DIST) \
 	$(evolution_import_rss_SOURCES)
 errorDATA_INSTALL = $(INSTALL_DATA)
 gladeDATA_INSTALL = $(INSTALL_DATA)
@@ -173,8 +174,8 @@
 GREP = @GREP@
 GTK_VERSION = @GTK_VERSION@
 HAVE_BUGGY_GECKO = @HAVE_BUGGY_GECKO@
+HAVE_GECKO = @HAVE_GECKO@
 HAVE_GECKO_1_9 = @HAVE_GECKO_1_9@
-HAVE_GTKMOZEMEBED = @HAVE_GTKMOZEMEBED@
 HAVE_RENDERKIT = @HAVE_RENDERKIT@
 HAVE_WEBKIT = @HAVE_WEBKIT@
 HAVE_XULRUNNER = @HAVE_XULRUNNER@
@@ -317,18 +318,29 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = -I$(EVOLUTION_SOURCE) -I$(top_srcdir) $(RENDER_CFLAGS) \
-	$(DBUS_CFLAGS) -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-	-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-	-DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\" \
-	-DEVOLUTION_VERSION=$(evolution_exec_int) \
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\" \
-	-DGTK_VERSION="$(GTK_VERSION)" \
-	-DLIBSOUP_VERSION="$(SOUP_VERSION)" -DRENDER=\""$(RENDER)"\" \
-	-DRENDER_N=$(RENDER_N) -DHAVE_DBUS=$(DBD) \
-	-DDBUS_API_SUBJECT_TO_CHANGE $(EVOLUTION_RSS_EPLUGIN_CFLAGS) \
-	$(am__append_1)
+INCLUDES = \
+	-I$(EVOLUTION_SOURCE)					\
+	-I$(top_srcdir)						\
+	$(RENDER_CFLAGS)					\
+	$(DBUS_CFLAGS)						\
+	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""		\
+	-DLOCALEDIR="\"$(LOCALEDIR)\""				\
+	-DEVOLUTION_VERSION_STRING=\"$(EVOLUTION_EXEC_VERSION)\"\
+	-DEVOLUTION_VERSION=$(evolution_exec_int)		\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"            	\
+	-DEVOLUTION_ICONDIR=\""$(ICON_DIR)"\"            	\
+	-DGTK_VERSION="$(GTK_VERSION)"	          	  	\
+	-DLIBSOUP_VERSION="$(SOUP_VERSION)"	            	\
+	-DRENDER=\""$(RENDER)"\"				\
+	-DRENDER_N=$(RENDER_N)					\
+	-DHAVE_DBUS=$(DBD)					\
+	-DDBUS_API_SUBJECT_TO_CHANGE				\
+	$(EVOLUTION_RSS_EPLUGIN_CFLAGS)
+
+
+#if ! HAVE_XPCOM_GLUE
+#INCLUDES += -DGECKO_HOME=\""$(GECKO_HOME)"\"
+#endif
 RSS_MENU = \
 	<hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n		\
       		<menu target=\"select\" id=\"org.gnome.evolution.mail.browser\">\n	\
@@ -345,7 +357,8 @@
 	org-gnome-evolution-rss.xml
 
 plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
-liborg_gnome_evolution_rss_la_SOURCES = rss.c gecko-utils.cpp
+SOURCES = rss.c $(am__append_1)
+liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
 liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
 evolution_import_rss_SOURCES = evolution-import-rss.c
 evolution_import_rss_LDFLAGS = $(DBUS_LIBS)
@@ -374,10 +387,10 @@
 	network-soup.c				\
 	misc.c					\
 	dbus.c					\
-	rss-config-factory.c			\
-	rss-config-factory.h			\
 	gecko-utils.cpp				\
 	gecko-utils.h				\
+	rss-config-factory.c			\
+	rss-config-factory.h			\
 	evolution-import-rss.c			\
 	evolution-rss.schemas.in		\
 	org-gnome-evolution-rss.eplug.xml	\

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Tue Jul  8 19:00:18 2008
@@ -63,7 +63,7 @@
 #endif
 
   if (indices[0] == 2)
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
         sensitive = 1;
 #else
         sensitive = 0;
@@ -96,7 +96,7 @@
                 return;
         if (!id) id = 10;
         gconf_client_set_int(rss_gconf, GCONF_KEY_HTML_RENDER, id, NULL);
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
         if (id == 2)
                 rss_mozilla_init();
 #endif
@@ -1586,7 +1586,7 @@
                         break;
 #endif
                 case 2:
-#ifndef HAVE_GTKMOZEMBED
+#ifndef HAVE_GECKO
                         gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
                         break;
 #endif
@@ -1601,7 +1601,7 @@
                                         set_sensitive,
                                         NULL, NULL);
 
-#if !defined(HAVE_GTKMOZEMBED) && !defined (HAVE_WEBKIT)
+#if !defined(HAVE_GECKO) && !defined (HAVE_WEBKIT)
         GtkWidget *label_webkit = glade_xml_get_widget(ui->xml, "label_webkits");
         gtk_label_set_text(GTK_LABEL(label_webkit), _("Note: In order to be able to use Mozilla (Firefox) or Apple Webkit \nas renders you need firefox or webkit devel package \ninstalled and evolution-rss should be recompiled to see those packages."));
         gtk_widget_show(label_webkit);
@@ -1867,7 +1867,7 @@
 			break;
 #endif
 		case 2:
-#ifndef HAVE_GTKMOZEMBED
+#ifndef HAVE_GECKO
 			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 			break;
 #endif
@@ -1882,7 +1882,7 @@
 					set_sensitive,
 					NULL, NULL);
 
-#if !defined(HAVE_GTKMOZEMBED) && !defined (HAVE_WEBKIT)
+#if !defined(HAVE_GECKO) && !defined (HAVE_WEBKIT)
 	GtkWidget *label_webkit = glade_xml_get_widget(sf->gui, "label_webkits");
 	gtk_label_set_text(GTK_LABEL(label_webkit), _("Note: In order to be able to use Mozilla (Firefox) or Apple Webkit \nas renders you need firefox or webkit devel package \ninstalled and evolution-rss should be recompiled to see those packages."));
 	gtk_widget_show(label_webkit);

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Jul  8 19:00:18 2008
@@ -88,7 +88,7 @@
 #include <libxml/HTMLparser.h>
 
 #ifdef HAVE_RENDERKIT
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 #ifdef HAVE_GECKO_1_9
 #include <gtkmozembed.h>
 #else
@@ -1497,7 +1497,7 @@
 static void
 stop_cb (GtkWidget *button, EMFormatHTMLPObject *pobject)
 {
-#ifdef	HAVE_GTKMOZEMBED
+#ifdef	HAVE_GECKO
 	gtk_moz_embed_stop_load(GTK_MOZ_EMBED(rf->mozembed));
 #endif
 #if HAVE_WEBKIT
@@ -1511,7 +1511,7 @@
 	switch (engine)
 	{
 		case 2:
-#ifdef	HAVE_GTKMOZEMBED
+#ifdef	HAVE_GECKO
 	gtk_moz_embed_stop_load(GTK_MOZ_EMBED(rf->mozembed));
        	gtk_moz_embed_load_url (GTK_MOZ_EMBED(rf->mozembed), data);
 #endif
@@ -1570,7 +1570,7 @@
 	}
 }
 
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 void
 rss_mozilla_init(void)
 {
@@ -1585,6 +1585,7 @@
 }
 #endif
 
+#ifdef HAVE_GECKO
 void
 render_set_preferences(void)
 {
@@ -1599,6 +1600,7 @@
 	gecko_prefs_set_string("general.useragent.extra.firefox", agstr); 
 	g_free(agstr);
 }
+#endif
 
 #ifdef HAVE_RENDERKIT
 static gboolean
@@ -1627,7 +1629,7 @@
 	}
 #endif
 
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 	if (engine == 2)
 	{
 		if (!g_thread_supported ()) {
@@ -1657,7 +1659,7 @@
 	}
 #endif
 
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 	if (engine == 2)
 	{
 		d(g_print("Render engine Gecko\n"));
@@ -1771,7 +1773,7 @@
 {
 	struct _org_gnome_rss_controls_pobject *po = (struct _org_gnome_rss_controls_pobject *) o;
 	guint engine = gconf_client_get_int(rss_gconf, GCONF_KEY_HTML_RENDER, NULL);
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 	if (engine == 2)
 	{
 		gtk_moz_embed_stop_load(GTK_MOZ_EMBED(rf->mozembed));
@@ -3236,6 +3238,7 @@
 		gconf_client_get_int(rss_gconf, 
 			GCONF_KEY_HTML_RENDER, 
 			NULL));
+#ifdef HAVE_GECKO
 	//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
@@ -3245,6 +3248,7 @@
 #else
 	gecko_shutdown();
 #endif
+#endif
 }
 
 guint
@@ -3252,11 +3256,11 @@
 {
 #ifdef HAVE_RENDERKIT
         guint engine = gconf_client_get_int(rss_gconf, GCONF_KEY_HTML_RENDER, NULL);
-#if !defined(HAVE_GTKMOZEMBED) && !defined (HAVE_WEBKIT)
+#if !defined(HAVE_GECKO) && !defined (HAVE_WEBKIT)
         engine=0;
 #endif
 if (engine == 2) {
-#if !defined(HAVE_GTKMOZEMBED)
+#if !defined(HAVE_GECKO)
         engine=1;
 #endif
 }
@@ -3324,7 +3328,7 @@
   				gconf_client_set_int(rss_gconf, 
 						GCONF_KEY_HTML_RENDER, render, NULL);
 			}
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 			if (2 == render)
 				rss_mozilla_init();
 #endif

Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h	(original)
+++ trunk/src/rss.h	Tue Jul  8 19:00:18 2008
@@ -272,7 +272,7 @@
 gchar *lookup_main_folder(void);
 gchar *lookup_feed_folder(gchar *folder);
 gchar *decode_html_entities(gchar *str);
-#ifdef HAVE_GTKMOZEMBED
+#ifdef HAVE_GECKO
 void rss_mozilla_init(void);
 #endif
 gpointer lookup_key(gpointer key);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]