rpms/evolution-rss/devel evolution-rss-0.1.4-icon-size.patch, NONE, 1.1 evolution-rss-0.1.4-recv-feeds2.patch, NONE, 1.1 evolution-rss-0.1.4-sanitize-icon.patch, NONE, 1.1 evolution-rss.spec, 1.36, 1.37
Lucian Langa
lucilanga at fedoraproject.org
Mon Nov 23 20:26:12 UTC 2009
Author: lucilanga
Update of /cvs/pkgs/rpms/evolution-rss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5429
Modified Files:
evolution-rss.spec
Added Files:
evolution-rss-0.1.4-icon-size.patch
evolution-rss-0.1.4-recv-feeds2.patch
evolution-rss-0.1.4-sanitize-icon.patch
Log Message:
upstream patch to fix a crash in displaying folder icons (#539649)
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/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
evolution-rss-0.1.4-recv-feeds2.patch:
rss.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- NEW FILE evolution-rss-0.1.4-recv-feeds2.patch ---
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 05:00:09.000000000 -0400
+++ evolution-rss-0.1.4-mod/src/rss.c 2009-11-04 21:35:39.535483549 -0500
@@ -2812,7 +2812,11 @@
GMutex *lock;
/* states/data used during shutdown */
- enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#if EVOLUTION_VERSION >= 22800
+ enum { MC_QUIT_NOT_START, MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#else
+ enum { MC_QUIT_START, MC_QUIT_SYNC, MC_QUIT_THREADS } quit_state;
+#endif
};
void
@@ -2829,7 +2833,7 @@
deleted = 1;
MailComponent *mc = mail_component_peek ();
- if (mc->priv->quit_state != -1)
+ if (mc->priv->quit_state != MC_QUIT_NOT_START)
rf->cancel_all=1;
d(g_print("taskbar_op_finish() queue:%d\n", rf->feed_queue));
@@ -3194,7 +3198,7 @@
{
MailComponent *mc = mail_component_peek ();
g_print("stAte:%d\n", mc->priv->quit_state);
- if (mc->priv->quit_state != -1)
+ if (mc->priv->quit_state != MC_QUIT_NOT_START)
rf->cancel=1;
if (!rf->pending && !rf->feed_queue && !rf->cancel_all && rf->online) {
evolution-rss-0.1.4-sanitize-icon.patch:
rss.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE evolution-rss-0.1.4-sanitize-icon.patch ---
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-11-23 21:18:15.000000000 +0200
+++ evolution-rss-0.1.4-mod/src/rss.c 2009-11-23 21:17:18.000000000 +0200
@@ -4859,6 +4859,8 @@
gint *sizes;
gint size, i=0;
+ g_return_val_if_fail(tree_store, FALSE);
+
pixbuf = gdk_pixbuf_new_from_file(img_file, NULL);
if (pixbuf) {
Index: evolution-rss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-rss/devel/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 Nov 2009 20:26:11 -0000 1.37
@@ -11,13 +11,16 @@
Name: evolution-rss
Summary: Evolution RSS Reader
Version: 0.1.4
-Release: 4%{?dist}
+Release: 6%{?dist}.1
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
+Patch3: evolution-rss-0.1.4-recv-feeds2.patch
+Patch4: evolution-rss-0.1.4-sanitize-icon.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: evolution
@@ -27,7 +30,7 @@ Requires(preun):GConf2
BuildRequires: gettext
BuildRequires: evolution-devel
-BuildRequires: evolution-data-server-devel
+BuildRequires: evolution-data-server-devel
BuildRequires: dbus-glib-devel
BuildRequires: xulrunner-devel-unstable
BuildRequires: WebKit-gtk-devel
@@ -43,6 +46,9 @@ 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
+%patch3 -p1 -b .recv-feeds
+%patch4 -p1 -b .sanitize-icon
%build
%configure --with-primary-render=gecko
@@ -96,6 +102,13 @@ fi
%{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
%changelog
+* Mon Nov 23 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-6.1
+- upstream patch to fix a crash in displaying folder icons (#539649)
+
+* Thu Nov 05 2009 Lucian Langa <cooly at gnome.eu.org> - 0.1.4-5
+- add new upstream fix for feeds fetching for evolution > 2.28.1
+- 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