[pkg-fso-commits] [SCM] openmoko panel plugin branch, debian, updated. debian/0.6-1-1-ga922cb2

[ohli (none)]

The following commit has been merged in the debian branch:
commit a922cb27423ba235c510e93eb412cb94a9618765
Author: ohli <ohli at workuta.(none)>
Date:   Sat Nov 22 12:19:30 2008 +0100

    tag for release

diff --git a/debian/changelog b/debian/changelog
index 47b2268..7f847d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openmoko-panel-plugin (0.6-2) pkg-fso; urgency=low
+
+  * do not vibrated if disabled in config
+
+ -- Sebastian Ohl <sebastian at ohl.name>  Sat, 22 Nov 2008 12:17:06 +0100
+
 openmoko-panel-plugin (0.6-1) pkg-fso; urgency=low
 
   * porting to fso milestone 4 
diff --git a/openmoko-panel-plugin b/openmoko-panel-plugin
index 244aff4..a745113 100755
--- a/openmoko-panel-plugin
+++ b/openmoko-panel-plugin
@@ -903,7 +903,8 @@ class BatteryIcon( StatusIcon ):
             self.batteryWindow = None
             self.batteryWindowActive = False
         elif (data in ['100', '500', '1000']):
-            self.parentObject.commitVibration(30)
+            if (self.doVibrationOnActivation):
+                self.parentObject.commitVibration(30)
             if (self.checkType()):
                 os.system("echo %s > %s" % (data, self.sysUsbLimit))
 
@@ -1163,11 +1164,13 @@ class BrightnessIcon (StatusIcon):
             self.brightnessWindow = None
 
         elif (data == 'inc') and (self.brightness < 100):
-            self.parentObject.commitVibration(30)
+            if (self.doVibrationOnActivation):
+                self.parentObject.commitVibration(30)
             self.brightness += 10
 
         elif (data == 'dec') and (self.brightness > 0):
-            self.parentObject.commitVibration(30)
+            if (self.doVibrationOnActivation):
+                self.parentObject.commitVibration(30)
             self.brightness -= 10
 
         if (self.brightness > 100):

-- 
openmoko panel plugin