evolution-rss r357 - in trunk: . pixmaps src

[lucilanga svn gnome org]

Author: lucilanga
Date: Wed Aug 13 17:27:27 2008
New Revision: 357
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=357&view=rev

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

* src/rss.c: org_gnome_cooly_rss()
fix for #546892

(e_icon_factory_get_image):
Kill this function.  Use gtk_image_new_from_icon_name().
(e_icon_factory_get_icon_list):
Kill this function.  Use
gtk_window_set_icon_name().

Modified:
   trunk/ChangeLog
   trunk/pixmaps/Makefile.am
   trunk/pixmaps/Makefile.in
   trunk/src/rss.c

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Wed Aug 13 17:27:27 2008
@@ -5,7 +5,9 @@
 pixmap_DATA = rss.png 		\
 		rss-16.png 	\
 		rss-22.png 	\
-		rss-24.png
+		rss-24.png	\
+		rss-icon-read.png \
+		rss-icon-unread.png
 
 EXTRA_DIST = $(pixmap_DATA)
 

Modified: trunk/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Wed Aug 13 17:27:27 2008
@@ -266,7 +266,9 @@
 pixmap_DATA = rss.png 		\
 		rss-16.png 	\
 		rss-22.png 	\
-		rss-24.png
+		rss-24.png	\
+		rss-icon-read.png \
+		rss-icon-unread.png
 
 EXTRA_DIST = $(pixmap_DATA)
 all: all-am

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Wed Aug 13 17:27:27 2008
@@ -338,12 +338,16 @@
 taskbar_op_new(gchar *message)
 #endif
 {
-	static GdkPixbuf *progress_icon = NULL;
 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
-	progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU);
-//	progress_icon = NULL;
 	char *mcp = g_strdup_printf("%p", mail_component_peek());
 	guint activity_id = 
+#if (EVOLUTION_VERSION >= 22306)
+		e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail",
+						message, TRUE,
+						(void (*) (gpointer))abort_all_soup,
+						 key);
+#else 
+	static GdkPixbuf *progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU);
 #if (EVOLUTION_VERSION >= 22200)
 		e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail",
 						progress_icon, message, TRUE,
@@ -353,6 +357,7 @@
 		e_activity_handler_operation_started(activity_handler, mcp,
 						progress_icon, message, FALSE);
 #endif
+#endif
 
 	g_free(mcp);
 	return activity_id;
@@ -1979,7 +1984,7 @@
 		goto out;
 	if (!g_ascii_strcasecmp(t->folder_name, main_folder))
 		goto normal;
-	gchar *rss_folder = extract_main_folder(t->folder_name);
+	gchar *rss_folder = extract_main_folder((gchar *)t->folder_name);
 	if (!rss_folder)
 		goto out;
 	if (!icons)
@@ -2990,7 +2995,7 @@
 {
 	if (!status_icon) {
 		gchar *iconfile = g_build_filename (EVOLUTION_ICONDIR,
-	                                    "rss-24.png",
+	                                    "rss-icon-unread.png",
                                             NULL);
 
 		status_icon = gtk_status_icon_new ();
@@ -3338,8 +3343,8 @@
 	                                    "rss-24.png",
                                             NULL);
 
-	GtkWidget *recv_icon = e_icon_factory_get_image (
-                        iconfile, E_ICON_SIZE_LARGE_TOOLBAR);
+	GtkWidget *recv_icon = gtk_image_new_from_file(
+                        iconfile);
 	g_free(iconfile);
 
 
@@ -4288,10 +4293,6 @@
         tmp = camel_file_util_safe_filename(key);
 	if (!tmp)
 		return NULL;
-	g_print("key:%s\n", key);
-	g_print("dir:%s\n", dir);
-	g_print("strlen(tmp):%d\n", strlen(tmp));
-	g_print("tmp:%s\n", tmp);
         real = g_strdup_printf("%s/%s", dir, tmp);
         g_free(tmp);
 
@@ -4318,7 +4319,6 @@
 		stream = camel_data_cache_add(http_cache, HTTP_CACHE_PATH, url, NULL);
 	} else 
 		g_print("image cache HIT\n");
-	g_print("fetch url:%s\n", url);
 
 	/* test for *loading* images*/
 /*	gchar *iconfile = g_build_filename (EVOLUTION_ICONDIR,
@@ -4341,7 +4341,6 @@
 				0,
                                	&err);
 	if (err) return NULL;
-	g_print("fetch url:%s\n", url);
 	return data_cache_path(http_cache, FALSE, HTTP_CACHE_PATH, url);
 }