rpms/evolution-rss/F-12 evolution-rss-0.1.4-icon-size.patch, NONE, 1.1 evolution-rss.spec, 1.36, 1.37

Lucian Langa lucilanga at fedoraproject.org
Fri Oct 23 16:35:09 UTC 2009 

Author: lucilanga

Update of /cvs/pkgs/rpms/evolution-rss/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2637

Modified Files:
	evolution-rss.spec 
Added Files:
	evolution-rss-0.1.4-icon-size.patch 
Log Message:
add patch for icon loading

evolution-rss-0.1.4-icon-size.patch:
 src/rss-icon-factory.c |    2 ++
 src/rss.c              |   40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE evolution-rss-0.1.4-icon-size.patch ---
diff -Naur evolution-rss-0.1.4/config.h evolution-rss-0.1.4-mod/config.h
diff -Naur evolution-rss-0.1.4/config.log evolution-rss-0.1.4-mod/config.log
diff -Naur evolution-rss-0.1.4/config.status evolution-rss-0.1.4-mod/config.status
diff -Naur evolution-rss-0.1.4/evolution-rss.spec evolution-rss-0.1.4-mod/evolution-rss.spec
diff -Naur evolution-rss-0.1.4/libtool evolution-rss-0.1.4-mod/libtool
diff -Naur evolution-rss-0.1.4/Makefile evolution-rss-0.1.4-mod/Makefile
diff -Naur evolution-rss-0.1.4/pixmaps/Makefile evolution-rss-0.1.4-mod/pixmaps/Makefile
diff -Naur evolution-rss-0.1.4/po/Makefile evolution-rss-0.1.4-mod/po/Makefile
diff -Naur evolution-rss-0.1.4/po/Makefile.in evolution-rss-0.1.4-mod/po/Makefile.in
diff -Naur evolution-rss-0.1.4/po/POTFILES evolution-rss-0.1.4-mod/po/POTFILES
diff -Naur evolution-rss-0.1.4/src/.deps/dbus.Plo evolution-rss-0.1.4-mod/src/.deps/dbus.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/evolution-import-rss.Po evolution-rss-0.1.4-mod/src/.deps/evolution-import-rss.Po
diff -Naur evolution-rss-0.1.4/src/.deps/fetch.Plo evolution-rss-0.1.4-mod/src/.deps/fetch.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/file-gio.Plo evolution-rss-0.1.4-mod/src/.deps/file-gio.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/gecko-utils.Plo evolution-rss-0.1.4-mod/src/.deps/gecko-utils.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/misc.Plo evolution-rss-0.1.4-mod/src/.deps/misc.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/network-soup.Plo evolution-rss-0.1.4-mod/src/.deps/network-soup.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/parser.Plo evolution-rss-0.1.4-mod/src/.deps/parser.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/rss-config-factory.Plo evolution-rss-0.1.4-mod/src/.deps/rss-config-factory.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/rss-icon-factory.Plo evolution-rss-0.1.4-mod/src/.deps/rss-icon-factory.Plo
diff -Naur evolution-rss-0.1.4/src/.deps/rss.Plo evolution-rss-0.1.4-mod/src/.deps/rss.Plo
diff -Naur evolution-rss-0.1.4/src/.libs/dbus.o evolution-rss-0.1.4-mod/src/.libs/dbus.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/fetch.o evolution-rss-0.1.4-mod/src/.libs/fetch.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/file-gio.o evolution-rss-0.1.4-mod/src/.libs/file-gio.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/gecko-utils.o evolution-rss-0.1.4-mod/src/.libs/gecko-utils.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/liborg-gnome-evolution-rss.lai evolution-rss-0.1.4-mod/src/.libs/liborg-gnome-evolution-rss.lai
diff -Naur evolution-rss-0.1.4/src/.libs/liborg-gnome-evolution-rss.so evolution-rss-0.1.4-mod/src/.libs/liborg-gnome-evolution-rss.so
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/misc.o evolution-rss-0.1.4-mod/src/.libs/misc.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/network-soup.o evolution-rss-0.1.4-mod/src/.libs/network-soup.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/parser.o evolution-rss-0.1.4-mod/src/.libs/parser.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/rss-config-factory.o evolution-rss-0.1.4-mod/src/.libs/rss-config-factory.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/rss-icon-factory.o evolution-rss-0.1.4-mod/src/.libs/rss-icon-factory.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/.libs/rss.o evolution-rss-0.1.4-mod/src/.libs/rss.o
\ No newline at end of file
diff -Naur evolution-rss-0.1.4/src/Makefile evolution-rss-0.1.4-mod/src/Makefile
diff -Naur evolution-rss-0.1.4/src/rss.c evolution-rss-0.1.4-mod/src/rss.c
--- evolution-rss-0.1.4/src/rss.c	2009-08-26 12:00:09.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss.c	2009-10-23 17:40:25.000000000 +0300
@@ -2365,7 +2365,7 @@
 				g_hash_table_insert(icons, g_strdup(key), icon);
 				g_object_set (t->renderer, "pixbuf", icon, "visible", 1, NULL);
 			} else
-				goto defico; //failed to load the icon so just throw the default
+				goto normal; //failed to load the icon so just throw the default
 
 			g_free(feed_file);
 #endif
@@ -2382,27 +2382,20 @@
 		goto out;
 	}
 
-normal:	if (!initialised) { //move this to startup
-defico:		iconfile = g_build_filename (EVOLUTION_ICONDIR,
-	                                    "rss-16.png",
-						NULL);
 #if (EVOLUTION_VERSION >= 22703)
-		folder_icon = e_icon_factory_get_icon (iconfile, GTK_ICON_SIZE_MENU);
-		gtk_icon_theme_add_builtin_icon     ("evolution-rss-main",
-				GTK_ICON_SIZE_INVALID,
-				folder_icon);
+normal:	gtk_tree_store_set (
+                t->store, t->iter,
+                COL_STRING_ICON_NAME, "rss-16",
+                -1);
 #else
+normal:	if (!initialised) {
+		iconfile = g_build_filename (EVOLUTION_ICONDIR,
+				"rss-16.png",
+				NULL);
 		folder_icon = e_icon_factory_get_icon (iconfile, E_ICON_SIZE_MENU);
-#endif
 		g_free(iconfile);
 		initialised = TRUE;
 	}
-#if (EVOLUTION_VERSION >= 22703)
-	gtk_tree_store_set (
-                t->store, t->iter,
-                COL_STRING_ICON_NAME, "evolution-rss-main",
-                -1);
-#else
 	g_object_set (t->renderer, "pixbuf", folder_icon, "visible", 1, NULL);
 #endif
 out:	g_free(main_folder);
@@ -4854,6 +4847,8 @@
 	struct _EMFolderTreeModelStoreInfo *si;
 	CamelStore *store = mail_component_peek_local_store(NULL);
 	CamelFolder *rss_folder;
+	gint *sizes;
+	gint size, i=0;
 
 	pixbuf = gdk_pixbuf_new_from_file(img_file, NULL);
 
@@ -4867,11 +4862,16 @@
 			result = FALSE; 
 			goto out;
 		}
-		icon = e_icon_factory_get_icon (img_file, GTK_ICON_SIZE_DIALOG);
+		icon = e_icon_factory_get_icon (img_file, GTK_ICON_SIZE_MENU);
 		g_hash_table_insert(icons, g_strdup(key), GINT_TO_POINTER(1));
-		gtk_icon_theme_add_builtin_icon(key,
-						GTK_ICON_SIZE_INVALID,
-						icon);
+		sizes = gtk_icon_theme_get_icon_sizes(gtk_icon_theme_get_default(),
+                                "mail-read"); //will mail-read always be there?
+                for (i=0; -1 != (size = sizes[i]); i++)
+                        gtk_icon_theme_add_builtin_icon(key,
+                                size,
+                                icon);
+                g_free(sizes);
+
 		si = g_hash_table_lookup (mod->store_hash, store);
 		row = g_hash_table_lookup (si->full_hash, full_name);
 		path = gtk_tree_row_reference_get_path (row);
diff -Naur evolution-rss-0.1.4/src/rss-icon-factory.c evolution-rss-0.1.4-mod/src/rss-icon-factory.c
--- evolution-rss-0.1.4/src/rss-icon-factory.c	2009-05-15 16:49:48.000000000 +0300
+++ evolution-rss-0.1.4-mod/src/rss-icon-factory.c	2009-10-23 17:02:01.000000000 +0300
@@ -57,5 +57,7 @@
 		gtk_icon_set_unref(set);
 	}
         gtk_icon_source_free(source);
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                           EVOLUTION_ICONDIR);
 }
 
diff -Naur evolution-rss-0.1.4/stamp-h1 evolution-rss-0.1.4-mod/stamp-h1


Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/F-12/evolution-rss.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- evolution-rss.spec	16 Sep 2009 17:24:06 -0000	1.36
+++ evolution-rss.spec	23 Oct 2009 16:35:09 -0000	1.37
@@ -11,13 +11,14 @@
 Name:		evolution-rss
 Summary:	Evolution RSS Reader
 Version:	0.1.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Group:		Applications/Internet
 License:	GPLv2 and GPLv2+
 URL:		http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin
 Source:		http://gnome.eu.org/%{name}-%{version}.tar.gz
 Patch0:		evolution-rss-0.1.4-folder-rename.patch
 Patch1:		evolution-rss-0.1.4-folder-properties.patch
+Patch2:		evolution-rss-0.1.4-icon-size.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	evolution
 
@@ -43,6 +44,7 @@ This is an evolution plugin which enable
 %setup -q -n evolution-rss-%{version}
 %patch0 -p1 -b .folder-rename
 %patch1 -p1 -b .folder-properties
+%patch2 -p1 -b .icon-size
 
 %build
 %configure --with-primary-render=gecko
@@ -96,6 +98,9 @@ fi
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 
 %changelog
+* Fri Oct 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-5
+- add patch2 to fix loading of icons (gtk refuses to load icons with size 0)
+
 * Wed Sep 16 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-4
 - added patch to fix folder properties in evolution (#523552)
 - added upstream patch to fix folder rename (#594704)

More information about the fedora-extras-commits mailing list