rpms/listen/F-12 minor-fixes.patch,NONE,1.1 listen.spec,1.44,1.45

[Haïkel Guémar]

Author: hguemar

Update of /cvs/pkgs/rpms/listen/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16293

Modified Files:
	listen.spec 
Added Files:
	minor-fixes.patch 
Log Message:
fix RHBZ #549164, #553592 , #558222

minor-fixes.patch:
 plugins/generic/daapserver.py |    3 ++-
 source/wikipedia.py           |   10 +++++++---
 widget/timer.py               |    3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE minor-fixes.patch ---
diff -r 3a74529f5085 src/plugins/generic/daapserver.py
--- a/src/plugins/generic/daapserver.py	Sat Feb 20 18:07:23 2010 +0100
+++ b/src/plugins/generic/daapserver.py	Sat Feb 20 19:01:27 2010 +0100
@@ -542,7 +542,8 @@
             if self.__id_io:
                 gobject.source_remove(self.__id_io)
                 self.__id_io
-            self.daapdavahi.group.Free()
+            try: self.daapdavahi.group.Free()
+            except AttributeError: pass
             del self.daapd
             del self.daapdavahi
         super(DaapServerPlugin,self).destroy()
diff -r 3a74529f5085 src/source/wikipedia.py
--- a/src/source/wikipedia.py	Sat Feb 20 18:07:23 2010 +0100
+++ b/src/source/wikipedia.py	Sat Feb 20 19:01:27 2010 +0100
@@ -247,9 +247,13 @@
         self.fetch_information(None,action_map[i])
 
     def on_change_lang(self,widget):
-        self.lang = self.dropdown_lang.get_active_text().replace(".wikipedia.org","")
-        config.set("setting","wikipedia",self.lang)
-        self.fetch_information(None,self.last_action)
+        self.lang = self.dropdown_lang.get_active_text()
+        if self.lang is None:
+            pass
+        else:
+            self.lang.replace(".wikipedia.org","")
+            config.set("setting","wikipedia",self.lang)
+            self.fetch_information(None,self.last_action)
         
     def force_select(self,action,song):
         if action: self.set_action(action)
diff -r 3a74529f5085 src/widget/timer.py
--- a/src/widget/timer.py	Sat Feb 20 18:07:23 2010 +0100
+++ b/src/widget/timer.py	Sat Feb 20 19:01:27 2010 +0100
@@ -77,7 +77,8 @@
             if player.song: song = player.song
             else: return 
         
-        self.duration = song.get("#duration") / 1000
+        try: self.duration = song.get("#duration") / 1000
+        except TypeError: self.duration = -1
         self.set_current_time(0, self.duration)
 
     def on_tick(self,bin,pos,duration):


Index: listen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/listen/F-12/listen.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- listen.spec	4 Jan 2010 13:17:42 -0000	1.44
+++ listen.spec	23 Feb 2010 19:32:52 -0000	1.45
@@ -1,11 +1,12 @@
 Name:           listen
 Version:        0.6.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.listen-project.org
 Source0:        http://www.listen-project.org/downloads/0.6/%{name}-%{version}.tar.gz
+Patch0:		minor-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -74,6 +75,7 @@ Listen can be extended with plugins.
 
 %prep
 %setup -q -n %{name}-%{version} 
+%patch0 -p1
 # mandatory to build inside mock
 %{__sed} -i 's#CHECK_DEPENDS ?= 1#CHECK_DEPENDS ?= 0#' Makefile
 # correct path issue on 64bit boxes
@@ -127,6 +129,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Feb 23 2010 Haïkel Guémar <karlthered at gmail.com> - 0.6.3-3
+- fix RHBZ #549164, #553592 , #558222
+
 * Mon Jan 04 2010 Haïkel Guémar <karlthered at gmail.com> - 0.6.3-2
 - add pyxdg as an explicit requires