rpms/listen/devel listen-dbus.patch,NONE,1.1 listen.spec,1.27,1.28

[Haïkel Guémar (hguemar)]

Author: hguemar

Update of /cvs/extras/rpms/listen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv662

Modified Files:
	listen.spec 
Added Files:
	listen-dbus.patch 
Log Message:
fixed dbus issue (thanks to Martin Sourada)
fixed typo in desktop file


listen-dbus.patch:

--- NEW FILE listen-dbus.patch ---
Index: src/dbus_manager.py
===================================================================
--- src/dbus_manager.py	(revision 670)
+++ src/dbus_manager.py	(working copy)
@@ -30,9 +30,18 @@
     import dbus
     import dbus.service
     #Try connection du message bus
-    dbus.SessionBus()
-    if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
+    dbus_version = getattr(dbus, 'version',(0,0,0))
+    if dbus_version >= (0,41,0) and dbus_version < (0,80,0):
+        dbus.SessionBus()
         import dbus.glib
+    elif dbus_version >= (0,80,0):
+        from dbus.mainloop.glib import DBusGMainLoop
+        DBusGMainLoop(set_as_default=True)
+        dbus.SessionBus()
+    else:
+        pass
+        
+
 except: dbus_imported = False
 else: dbus_imported=True
 
@@ -41,14 +50,14 @@
 
 if not dbus_imported:
     class ListenDBus:
-        def __init__(self,win,player,object_path="/org/gnome/listen/"):
+        def __init__(self,win,player,object_path="/org/gnome/listen"):
             self.player = player
             self.win = win    
     print "No dbus support"
 else:
     
     class ListenDBus(dbus.service.Object):
-        def __init__(self,win,player,object_path="/org/gnome/listen/"):
+        def __init__(self,win,player,object_path="/org/gnome/listen"):
             self.player = player
             self.win = win
             self.bus = dbus.SessionBus()
@@ -105,4 +114,4 @@
                 song = self.player.song    
                 return str( song.get_str("title")+ " - ("+song.get_str("album")+" - "+song.get_str("artist")+")")
             else:
-                return ""
\ No newline at end of file
+                return ""


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/devel/listen.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- listen.spec	9 Apr 2007 12:47:09 -0000	1.27
+++ listen.spec	3 May 2007 18:19:47 -0000	1.28
@@ -1,12 +1,13 @@
 Name:           listen
 Version:        0.5
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://listengnome.free.fr
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:         %{name}-gecko.patch 
+Patch1:		 	%{name}-dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{real_name}-root-%(%{__id_u} -n)
 
 Buildrequires: python-devel >= 2.4
@@ -92,8 +93,10 @@
 
 %prep
 %setup -q -n %{name}-%{version} 
+%{__sed} -i 's/Comment=Listen /Comment=Listen to/' misc/listen.desktop
 %{__sed} -i 's/python2.4/python/' src/listen.py
 %patch0 -p0
+%patch1 -p0
 %{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py
 # correct path issue on x86_64 box
 %ifarch x86_64 
@@ -153,6 +156,10 @@
 
 
 %changelog
+* Thu May 03 2007 Haïkel Guémar <karlthered at gmail.com> 0.5-14
+- fixed typo in desktop file
+- fixed dbus issue (upstream bug #566) courtesy of Martin Sourada
+
 * Sat Feb 10 2007 Haïkel Guémar <karlthered at gmail.com> 0.5-13
 - Updated to final release.