Merge lp:~hypery2k/touchpad-indicator/dell-bugfix into lp:touchpad-indicator

Proposed by mreinhardt
Status: Merged
Merged at revision: 50
Proposed branch: lp:~hypery2k/touchpad-indicator/dell-bugfix
Merge into: lp:touchpad-indicator
Diff against target: 41 lines (+7/-1)
2 files modified
debian/postinst (+1/-0)
src/touchpad.py (+6/-1)
To merge this branch: bzr merge lp:~hypery2k/touchpad-indicator/dell-bugfix
Reviewer Review Type Date Requested Status
Lorenzo Carbonell Pending
Review via email: mp+82687@code.launchpad.net

Description of the change

added bugfix for dell laptop which disables the psmouse kernel module when mouse is plugged in

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/postinst'
2--- debian/postinst 2011-10-11 18:49:29 +0000
3+++ debian/postinst 2011-11-18 14:43:24 +0000
4@@ -1,2 +1,3 @@
5 #!/bin/sh
6 #glib-compile-schemas /usr/share/glib-2.0/schemas/
7+/usr/share/touchpad-indicator/sudoers_setup.sh
8
9=== modified file 'src/touchpad.py'
10--- src/touchpad.py 2011-11-06 13:04:21 +0000
11+++ src/touchpad.py 2011-11-18 14:43:24 +0000
12@@ -100,15 +100,20 @@
13 for id in self.ids:
14 self.set_touchpad_disabled(id)
15 time.sleep(1)
16+ id=ejecuta('sudo rmmod psmouse')
17 return not self.all_touchpad_enabled()
18
19 def enable_all_touchpads(self):
20 for id in self.ids:
21 self.set_touchpad_enabled(id)
22 time.sleep(1)
23+ ejecuta('sudo modprobe psmouse')
24 return self.all_touchpad_enabled()
25
26 def all_touchpad_enabled(self):
27+ modules=ejecuta('lsmod')
28+ if "psmouse" in modules:
29+ return True
30 if not self.is_there_touchpad():
31 print 'como'
32 return False
33@@ -125,7 +130,7 @@
34 print ('El device %s es Touchpad %s')%(id,tp._is_touchpad(id))
35 tp.enable_all_touchpads()
36 print tp.all_touchpad_enabled()
37- #tp.disable_all_touchpads()
38+ tp.disable_all_touchpads()
39 print tp.all_touchpad_enabled()
40 tp.enable_all_touchpads()
41 print tp.is_there_touchpad()

Subscribers

People subscribed via source and target branches