Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 6a625b0f07fb60ad294dd6d75ff14172 > files > 7

evolution-rss-0.1.0-6.2mdv2009.0.src.rpm

--- evo-rss-0.1.0/src/rss.c	2008-08-28 16:19:02.000000000 -0400
+++ evolution-rss-0.1.0/src/rss.c	2008-08-28 16:29:46.000000000 -0400
@@ -332,20 +332,25 @@
 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 >= 22200)
-		e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail",
-						progress_icon, message, TRUE,
-						(void (*) (gpointer))abort_all_soup,
-						 key);
+        EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
+        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
-		e_activity_handler_operation_started(activity_handler, mcp,
-						progress_icon, message, FALSE);
+        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,
+                                                (void (*) (gpointer))abort_all_soup,
+                                                 key);
+ #else
+                e_activity_handler_operation_started(activity_handler, mcp,
+                                                progress_icon, message, FALSE);
+#endif
 #endif
 
 	g_free(mcp);
@@ -3109,9 +3111,9 @@
 	                                    "rss-24.png",
                                             NULL);
 
-	GtkWidget *recv_icon = e_icon_factory_get_image (
-                        iconfile, E_ICON_SIZE_LARGE_TOOLBAR);
-	g_free(iconfile);
+        GtkWidget *recv_icon = gtk_image_new_from_file(
+                        iconfile);
+        g_free(iconfile);
 
 
 	guint row = t->row;