evolution-rss r345 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Jul 28 06:31:34 2008
New Revision: 345
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=345&view=rev

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

* src/rss.c,
src/org-gnome-evolution-rss.eplug.xml:
add suport for folder custom icons
* src/configure.ac bump version
to devel

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

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Mon Jul 28 06:31:34 2008
@@ -36,3 +36,4 @@
 	* fix recursivity on layer_find_pos
 	* fix annoying cursor jump when browsing through evo-rss folders
 	* try harder to get feeds images (check by size 0)
+	* provide predefined groups of feeds (OSS & co)

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Jul 28 06:31:34 2008
@@ -181,6 +181,7 @@
 };*/
 
 static GdkPixbuf *folder_icon;
+GHashTable *icons = NULL;
 extern int xmlSubstituteEntitiesDefaultValue;
 
 rssfeed *rf = NULL;
@@ -1966,15 +1967,39 @@
 	g_print("refrish %s\n", t->uri);
 }
 
-#if (EVOLUTION_VERSION >= 22305)
+#if (EVOLUTION_VERSION >= 22306)
 void org_gnome_cooly_folder_icon(void *ep, EMEventTargetCustomIcon *t)
 {
 	static gboolean initialised = FALSE;
-
+	GdkImage *icon;
 	if (g_ascii_strncasecmp(t->folder_name, "RSS", 3))
 		return;
+	if (!g_ascii_strcasecmp(t->folder_name, "RSS"))
+		goto normal;
+	gchar *rss_folder = extract_main_folder(t->folder_name);
+	if (!rss_folder)
+		return;
+	if (!icons)
+		icons = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	gchar *key = g_hash_table_lookup(rf->hrname,
+				lookup_feed_folder(rss_folder));
+	if (!key)
+		goto normal;
+	if (!(icon = g_hash_table_lookup(icons, key))) {
+		gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
+        	gchar *feed_file = g_strdup_printf("%s/%s.img", feed_dir, key);
+        	if (g_file_test(feed_file, G_FILE_TEST_EXISTS)) {
+			icon = e_icon_factory_get_icon (feed_file, E_ICON_SIZE_MENU);
+			g_hash_table_insert(icons, g_strdup(key), icon);
+			g_object_set (t->renderer, "pixbuf", icon, "visible", 1, NULL);
+			return;
+		}
+	} else {
+		g_object_set (t->renderer, "pixbuf", icon, "visible", 1, NULL);
+		return;
+	}
 
-	if (!initialised)
+normal:	if (!initialised)
 	{
 		gchar *iconfile = g_build_filename (EVOLUTION_ICONDIR,
 	                                    "rss.png",