evolution-rss r394 - in trunk: . m4 po src

[lucilanga svn gnome org]

Author: lucilanga
Date: Thu Oct 23 15:25:09 2008
New Revision: 394
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=394&view=rev

Log:
2008-10-22  Lucian Langa <lucilanga gnome org>

* src/evolution-import-rss.c: lower number of
attempts to fire up evolution
* src/rss.c: (org_gnome_rss_controls)
allow themed icon on summary/full text button

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/configure.ac
   trunk/m4/intltool.m4
   trunk/po/POTFILES.in
   trunk/src/evolution-import-rss.c
   trunk/src/parser.c
   trunk/src/rss.c
   trunk/src/rss.h

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Thu Oct 23 15:25:09 2008
@@ -3,7 +3,7 @@
 	* probably move to soup_unblocking when rendering of an article
 	* when browsing a different feed/mail folder cancel all sessions
 	* also create groups when importing
-	* create some sort of progress popup when render with an external engine (webkit/gecko)
+	* create progress popup when render with an external engine (webkit/gecko)
 	* check webkit area sizing when using zoom in/out
 	* failback to old handler when formatting error
 	* when deleting a folder offer to delete feed also
@@ -11,13 +11,12 @@
 	* implement other engines besides soup
 	* implement USM (universal subscription mechanism)
 	* fix authentication for proxy dialog
-	* make auth dialog not intrusive (peek other software)
+	* make auth dialog not intrusive (peek others)
 	* fix ubuntu crashing when wrong entities (<0.0.6) and feed conf files stored in a file
 	* implement notify back of imported feed perhaps libnotify
 	* prefetch html content for all webkits (perhaps temp file)
 	* offline storage for article's home page
 	* implement web controls for diferent redering <Webkits> or <Gecko>
-	* force soup to follow redirects (304) test on fedora weekly news
 	* when adding a feed as opml file offer to import (file detection)
 	* run-time migration function from text/evolution-rss-feed -> x-evolution/evolution-rss-feed
 	* test new proxy authentification

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Oct 23 15:25:09 2008
@@ -300,7 +300,7 @@
 	have_dbus_build="yes"
 	import_feeds="evolution-import-rss"
 else
-	have_dbus_build="evolution-import-rss module will be not built"
+	have_dbus_build="evolution-import-rss module will not be built"
 	import_feeds="no"
 fi
 

Modified: trunk/m4/intltool.m4
==============================================================================
--- trunk/m4/intltool.m4	(original)
+++ trunk/m4/intltool.m4	Thu Oct 23 15:25:09 2008
@@ -171,6 +171,9 @@
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
     >"$1/stamp-it.tmp"
     [sed '/^#/d

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Oct 23 15:25:09 2008
@@ -3,11 +3,12 @@
 src/dbus.c
 src/evolution-rss.schemas.in
 src/network-soup.c
+src/org-gnome-evolution-rss.eplug.xml
+src/org-gnome-evolution-rss.error.xml
+src/org-gnome-evolution-rss.xml
 src/rss.c
 src/rss-config-factory.c
 src/rss-html-rendering.glade
 src/rss-ui.glade
-src/org-gnome-evolution-rss.eplug.xml
-src/org-gnome-evolution-rss.error.xml
-src/org-gnome-evolution-rss.xml
+src/parser.c
 src/GNOME_Evolution_RSS.server.in.in

Modified: trunk/src/evolution-import-rss.c
==============================================================================
--- trunk/src/evolution-import-rss.c	(original)
+++ trunk/src/evolution-import-rss.c	Thu Oct 23 15:25:09 2008
@@ -51,6 +51,7 @@
 	DBusPendingCall *pending;
 	if (!(message = dbus_message_new_signal (DBUS_PATH, DBUS_INTERFACE, "ping")))
 		return;
+	printf("ping evolution...\n");
 	int ret = dbus_connection_send (bus, message, NULL);
 	if (ret == FALSE)
     	{
@@ -171,7 +172,7 @@
                 send_dbus_ping ();
 	g_timeout_add (EVOLUTION_PING_TIMEOUT, no_evo_cb, NULL);
 	g_main_loop_run(loop);
-	while (!evo_running && i < 3)
+	while (!evo_running && i < 2)
 	{
 		system("evolution&");
 		g_print("fireing evolution...\n");

Modified: trunk/src/parser.c
==============================================================================
--- trunk/src/parser.c	(original)
+++ trunk/src/parser.c	Thu Oct 23 15:25:09 2008
@@ -965,7 +965,7 @@
 				free_cf(CF);
 			}
 			farticle++;
-			flicker_status_icon(chn_name, p);
+			update_status_icon(chn_name, p);
 		g_free(p);
 		}
 		d(g_print("put success()\n"));

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Thu Oct 23 15:25:09 2008
@@ -2798,24 +2798,25 @@
 }
 
 static void
-flicker_status_icon(const char *channel, gchar *title)
+update_status_icon(const char *channel, gchar *title)
 {
-	gchar *total = g_strdup_printf("%s: %s\n\n", channel, title);
-	create_status_icon();
-	g_queue_push_tail(status_msg, total);
-	//g_free(total);
-	if (g_queue_get_length(status_msg) == 6)
-		g_queue_pop_head(status_msg);
-	g_queue_foreach(status_msg, flaten_status, flat_status_msg);
-	gtk_status_icon_set_tooltip (status_icon, flat_status_msg);
-  	if (gconf_client_get_bool (rss_gconf, GCONF_KEY_STATUS_ICON, NULL))
+  	if (gconf_client_get_bool (rss_gconf, GCONF_KEY_STATUS_ICON, NULL)) {
+		gchar *total = g_strdup_printf("%s: %s\n\n", channel, title);
+		create_status_icon();
+		g_queue_push_tail(status_msg, total);
+		//g_free(total);
+		if (g_queue_get_length(status_msg) == 6)
+			g_queue_pop_head(status_msg);
+		g_queue_foreach(status_msg, flaten_status, flat_status_msg);
+		gtk_status_icon_set_tooltip (status_icon, flat_status_msg);
 		gtk_status_icon_set_visible (status_icon, TRUE);
-  	if (gconf_client_get_bool (rss_gconf, GCONF_KEY_BLINK_ICON, NULL)
-	 && !gtk_status_icon_get_blinking(status_icon))
-        	gtk_status_icon_set_blinking (status_icon, TRUE);
-	g_timeout_add(15 * 1000, flicker_stop, NULL);
-        g_free(flat_status_msg);
-	flat_status_msg = NULL;
+  		if (gconf_client_get_bool (rss_gconf, GCONF_KEY_BLINK_ICON, NULL)
+	 	&& !gtk_status_icon_get_blinking(status_icon))
+        		gtk_status_icon_set_blinking (status_icon, TRUE);
+		g_timeout_add(15 * 1000, flicker_stop, NULL);
+		g_free(flat_status_msg);
+		flat_status_msg = NULL;
+	}
 }
 
 static void

Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h	(original)
+++ trunk/src/rss.h	Thu Oct 23 15:25:09 2008
@@ -296,7 +296,7 @@
 gchar *generate_safe_chn_name(gchar *chn_name);
 void update_sr_message(void);
 void update_feed_image(gchar *image, gchar *key);
-static void flicker_status_icon(const char *channel, gchar *title);
+static void update_status_icon(const char *channel, gchar *title);
 static void
 #if LIBSOUP_VERSION < 2003000
 finish_enclosure (SoupMessage *msg, create_feed *user_data);