evolution-rss r339 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Jul 18 06:37:46 2008
New Revision: 339
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=339&view=rev

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

        * src/configure.in: force pickup of
        nspr includes
        * src/rss-config-factory.c: suppport
        for foaf importing
        * src/rss.c: add status icon

Modified:
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/Makefile.in
   trunk/src/rss.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jul 18 06:37:46 2008
@@ -182,6 +182,8 @@
 		PKG_CHECK_MODULES([GECKO],[libxul-embedding $gecko_cv_extra_pkg_dependencies  >= $gecko_min_version])
 		dnl https://bugzilla.mozilla.org/show_bug.cgi?id=442009
 		GECKO_CFLAGS="$GECKO_CFLAGS $(pkg-config --cflags nspr)"
+		AC_DEFINE_UNQUOTED(HAVE_BUGGY_GECKO, 1, [workarund for a bug in shutdown gecko])
+		AC_SUBST(HAVE_BUGGY_GECKO)
 	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])

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Jul 18 06:37:46 2008
@@ -19,9 +19,9 @@
 	$(EVOLUTION_RSS_EPLUGIN_CFLAGS)
 
  
-#if ! HAVE_XPCOM_GLUE
+if ! HAVE_XPCOM_GLUE
 INCLUDES += -DGECKO_HOME=\""$(GECKO_HOME)"\"
-#endif
+endif
 
 RSS_MENU = \
 	<hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n		\
@@ -74,7 +74,8 @@
 endif
 
 liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
-liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
+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)

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Fri Jul 18 06:37:46 2008
@@ -34,7 +34,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
- HAVE_GECKO_TRUE@am__append_1 = gecko-utils.cpp
+ HAVE_XPCOM_GLUE_FALSE@am__append_1 = -DGECKO_HOME=\""$(GECKO_HOME)"\"
+ HAVE_GECKO_TRUE@am__append_2 = gecko-utils.cpp
 @HAVE_DBUS_TRUE bin_PROGRAMS = evolution-import-rss$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -318,8 +319,6 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#if ! HAVE_XPCOM_GLUE
 INCLUDES = -I$(EVOLUTION_SOURCE) -I$(top_srcdir) $(RENDER_CFLAGS) \
 	$(DBUS_CFLAGS) -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
 	-DLOCALEDIR="\"$(LOCALEDIR)\"" \
@@ -331,8 +330,7 @@
 	-DLIBSOUP_VERSION="$(SOUP_VERSION)" -DRENDER=\""$(RENDER)"\" \
 	-DRENDER_N=$(RENDER_N) -DHAVE_DBUS=$(DBD) \
 	-DDBUS_API_SUBJECT_TO_CHANGE $(EVOLUTION_RSS_EPLUGIN_CFLAGS) \
-	-DGECKO_HOME=\""$(GECKO_HOME)"\"
-#endif
+	$(am__append_1)
 RSS_MENU = \
 	<hook class=\"org.gnome.evolution.mail.bonobomenu:1.0\">\n		\
       		<menu target=\"select\" id=\"org.gnome.evolution.mail.browser\">\n	\
@@ -349,9 +347,10 @@
 	org-gnome-evolution-rss.xml
 
 plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
-SOURCES = rss.c $(am__append_1)
+SOURCES = rss.c $(am__append_2)
 liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
-liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
+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)
 schemadir = $(GCONF_SCHEMA_FILE_DIR)

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Jul 18 06:37:46 2008
@@ -2878,6 +2878,15 @@
 }
 
 static void
+icon_activated (GtkStatusIcon *icon, gpointer pnotify)
+{
+        gtk_status_icon_set_visible (status_icon, FALSE);
+        g_object_unref (status_icon);
+
+        status_icon = NULL;
+}
+
+static void
 create_status_icon(void)
 {
 	if (!status_icon) {
@@ -2888,19 +2897,11 @@
 		status_icon = gtk_status_icon_new ();
         	gtk_status_icon_set_from_file (status_icon, iconfile);
 		g_free(iconfile);
+		g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
 	}
-        gtk_status_icon_set_visible (status_icon, FALSE);
+   //     gtk_status_icon_set_visible (status_icon, FALSE);
 }
         
-static void
-icon_activated (GtkStatusIcon *icon, gpointer pnotify)
-{
-        gtk_status_icon_set_visible (status_icon, FALSE);
-        g_object_unref (status_icon);
-
-        status_icon = NULL;
-}
-
 gboolean
 flicker_stop(gpointer user_data)
 {
@@ -2909,14 +2910,14 @@
 }
 
 static void
-flicker_status_icon(void)
+flicker_status_icon(gchar *channel)
 {
 	create_status_icon();
-	gchar *total = g_strdup_printf("Feeds: %d articles", farticle);
+	gchar *total = g_strdup_printf("Feeds: %d articles in %s", farticle, channel);
 	gtk_status_icon_set_tooltip (status_icon, total);
         gtk_status_icon_set_visible (status_icon, TRUE);
-        gtk_status_icon_set_blinking (status_icon, TRUE);
-	g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL);
+	if (!gtk_status_icon_get_blinking(status_icon))
+        	gtk_status_icon_set_blinking (status_icon, TRUE);
 	g_timeout_add(30*1000, flicker_stop, NULL);
         g_free(total);
 }
@@ -3289,13 +3290,15 @@
 	//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
+/*#ifdef HAVE_BUGGY_GECKO
 	if (2 == render)
 		system("killall -SIGTERM evolution");
 #else
 	gecko_shutdown();
+#endif*/
 #endif
-#endif
+	gecko_shutdown();
+	g_print("endd.\n");
 }
 
 guint
@@ -4511,7 +4514,7 @@
 				free_cf(CF);
 			}
 			farticle++;
-			flicker_status_icon();
+			flicker_status_icon(chn_name);
 		g_free(p);
 		}
 		d(g_print("put success()\n"));