rpms/gpodder/F-12 gpodder.git-7917c78ee8.patch, NONE, 1.1 gpodder.spec, 1.42, 1.43

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/gpodder/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19104

Modified Files:
	gpodder.spec 
Added Files:
	gpodder.git-7917c78ee8.patch 
Log Message:
* Fri Jun 04 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-4
- Add a patch to fix another TypeError, upstream bug #1041, rhbz #599232


gpodder.git-7917c78ee8.patch:
 model.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE gpodder.git-7917c78ee8.patch ---
>From 7917c78ee89d03d7de51baea4c1e4c091fdaca74 Mon Sep 17 00:00:00 2001
From: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date: Thu, 3 Jun 2010 22:48:56 +0300
Subject: [PATCH] Fix TypeError in update_by_iter, Red Hat Bugzilla #599232

---
 src/gpodder/gtkui/model.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/gpodder/gtkui/model.py b/src/gpodder/gtkui/model.py
index 4d77fec..4a4daa2 100644
--- a/src/gpodder/gtkui/model.py
+++ b/src/gpodder/gtkui/model.py
@@ -705,7 +705,10 @@ class PodcastListModel(gtk.ListStore):
 
     def update_by_iter(self, iter):
         # Given a GtkTreeIter, update volatile information
-        channel = self.get_value(iter, self.C_CHANNEL)
+        try:
+            channel = self.get_value(iter, self.C_CHANNEL)
+        except TypeError, te:
+            return
         if channel is None:
             return
         total, deleted, new, downloaded, unplayed = channel.get_statistics()
-- 
1.6.5.GIT



Index: gpodder.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpodder/F-12/gpodder.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gpodder.spec	28 May 2010 19:43:33 -0000	1.42
+++ gpodder.spec	4 Jun 2010 19:13:02 -0000	1.43
@@ -3,7 +3,7 @@
 
 Name:           gpodder
 Version:        2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -18,6 +18,8 @@ Patch2:         gpodder.git-67693b0.patc
 Patch3:         gpodder.git-b4886df.patch
 # Fix main menu items for "All episodes" view
 Patch4:         gpodder_no_episodes_edit_crash.patch
+# Fix TypeError in update_by_iter (bug 1041)
+Patch5:         gpodder.git-7917c78ee8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel, python-feedparser, python-mygpoclient
@@ -41,6 +43,7 @@ It also optionally supports syncing with
 %patch2 -p1
 %patch3 -p1
 %patch4
+%patch5 -p1
 
 %build
 make messages
@@ -88,6 +91,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Fri Jun 04 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-4
+- Add a patch to fix another TypeError, upstream bug #1041, rhbz #599232
+
 * Fri May 28 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.3-3
 - Forgot to cvs add the other patch, rebuild