Re: [sugar] [PATCH 2/2] return 0, not None, if we can't get the mixer volume

2008-06-10 Thread Tomeu Vizoso 
r+ Thanks!

On Wed, Jun 4, 2008 at 5:25 AM, Martin Dengler [EMAIL PROTECTED] wrote:
 ---
  src/hardware/hardwaremanager.py |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

 diff --git a/src/hardware/hardwaremanager.py b/src/hardware/hardwaremanager.py
 index 29f5fba..2f92537 100644
 --- a/src/hardware/hardwaremanager.py
 +++ b/src/hardware/hardwaremanager.py
 @@ -60,7 +60,7 @@ class HardwareManager(object):
 def get_volume(self):
 if not self._mixer or not self._master:
 logging.error('Cannot get the volume')
 -return None
 +return 0

 max_volume = self._master.max_volume
 min_volume = self._master.min_volume
 --
 1.5.5.1

 ___
 Sugar mailing list
 Sugar@lists.laptop.org
 http://lists.laptop.org/listinfo/sugar

___
Sugar mailing list
Sugar@lists.laptop.org
http://lists.laptop.org/listinfo/sugar

Re: [sugar] [PATCH 2/2] return 0, not None, if we can't get the mixer volume

2008-06-10 Thread Martin Dengler 

Thanks -- pushed both patches.

On Tue, Jun 10, 2008 at 09:25:43AM +0200, Tomeu Vizoso wrote:
 r+ Thanks!

 On Wed, Jun 4, 2008 at 5:25 AM, Martin Dengler [EMAIL PROTECTED] wrote:
  ---
   src/hardware/hardwaremanager.py |2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)
 
  diff --git a/src/hardware/hardwaremanager.py 
  b/src/hardware/hardwaremanager.py
  index 29f5fba..2f92537 100644
  --- a/src/hardware/hardwaremanager.py
  +++ b/src/hardware/hardwaremanager.py
  @@ -60,7 +60,7 @@ class HardwareManager(object):
  def get_volume(self):
  if not self._mixer or not self._master:
  logging.error('Cannot get the volume')
  -return None
  +return 0
 
  max_volume = self._master.max_volume
  min_volume = self._master.min_volume
  --
  1.5.5.1


pgpg0e9FiqaLa.pgp
Description: PGP signature
___
Sugar mailing list
Sugar@lists.laptop.org
http://lists.laptop.org/listinfo/sugar

[sugar] [PATCH 2/2] return 0, not None, if we can't get the mixer volume

2008-06-03 Thread Martin Dengler 
---
 src/hardware/hardwaremanager.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/hardware/hardwaremanager.py b/src/hardware/hardwaremanager.py
index 29f5fba..2f92537 100644
--- a/src/hardware/hardwaremanager.py
+++ b/src/hardware/hardwaremanager.py
@@ -60,7 +60,7 @@ class HardwareManager(object):
 def get_volume(self):
 if not self._mixer or not self._master:
 logging.error('Cannot get the volume')
-return None
+return 0
 
 max_volume = self._master.max_volume
 min_volume = self._master.min_volume
-- 
1.5.5.1

___
Sugar mailing list
Sugar@lists.laptop.org
http://lists.laptop.org/listinfo/sugar