rpms/system-config-soundcard/devel system-config-soundcard-2.0.6-dbus.patch, NONE, 1.1 system-config-soundcard.spec, 1.53, 1.54

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29525

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-2.0.6-dbus.patch 
Log Message:
fixed #223915 - system-config-soundcard does not start

system-config-soundcard-2.0.6-dbus.patch:
 soundcardBackendHal.py |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

--- NEW FILE system-config-soundcard-2.0.6-dbus.patch ---
--- system-config-soundcard-2.0.6/src/soundcardBackendHal.py.old	2006-06-30 14:07:38.000000000 +0200
+++ system-config-soundcard-2.0.6/src/soundcardBackendHal.py	2007-01-23 13:13:13.000000000 +0100
@@ -42,12 +42,19 @@
     
         self.doDebug = True
 
-        self._dbusBus = dbus.SystemBus()
-        self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager")
-        self.halManager = dbus.Interface(self.halManagerObj, "org.freedesktop.Hal.Manager")
-        
         self.driverList = self.read_driver_list()
                 
+	try:
+            self._dbusBus = dbus.SystemBus()
+            self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager")
+            self.halManager = dbus.Interface(self.halManagerObj, "org.freedesktop.Hal.Manager")
+	except:
+            self._dbusBus = []
+            self.halManagerObj = []
+            self.halManager = []
+            self.driverList = []
+            print _("Unable to initialize D-BUS/HAL!")
+       
         self.cards = {}
 
     def destroy(self, args):
@@ -160,14 +167,14 @@
     #if card.bus() == "macio" and card.driver() != "snd-powermac":
     def probeCards(self, default_card, default_device, card_list, card_max):
 
-        udiList = self.halManager.FindDeviceByCapability("alsa")        
-        for udi in udiList:
-            self.getDevices(udi)
+	if self.halManager != []:
+            udiList = self.halManager.FindDeviceByCapability("alsa")        
+            for udi in udiList:
+                self.getDevices(udi)
         
-        for index in self.cards:
-            if index < card_max :
-                card_list[index] = self.cards[index]
+            for index in self.cards:
+                if index < card_max :
+                    card_list[index] = self.cards[index]
                 
         card_list[default_card].default_device = default_device
-
         return card_list


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- system-config-soundcard.spec	21 Dec 2006 13:40:48 -0000	1.53
+++ system-config-soundcard.spec	23 Jan 2007 12:25:35 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 2.0.6
-Release: 1%{dist}
+Release: 2%{dist}
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Source0: %{name}-%{version}.tar.bz2
+Patch: system-config-soundcard-2.0.6-dbus.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext, intltool
 ExcludeArch: s390 s390x
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 make
@@ -81,6 +83,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Tue Jan 23 2007 Martin Stransky <stransky at redhat.com> 2.0.6-2
+- fixed #223915 - system-config-soundcard does not start
+
 * Thu Dec 21 2006 Martin Stransky <stransky at redhat.com> 2.0.6-1
 - translation update