summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2009-08-03 20:52:24 +0000
committerMichał Górny <mgorny@gentoo.org>2009-08-03 20:52:24 +0000
commit74c8cedb0447a601d262535997a956f41d4723ff (patch)
tree53a0f70582506284c2d4ddf34b36539479944313 /x11-misc/gestikk/files/gestikk-0.6-remove-libnotify.diff
parentdev-ruby/sinatra: New Ebuild for bug 280020 thanks to scarabeus, idl0r, a3li,... (diff)
downloadsunrise-74c8cedb0447a601d262535997a956f41d4723ff.tar.gz
sunrise-74c8cedb0447a601d262535997a956f41d4723ff.tar.bz2
sunrise-74c8cedb0447a601d262535997a956f41d4723ff.zip
x11-misc/gestikk: Ebuild for x11-misc/gestikk (bug #248260).
svn path=/sunrise/; revision=8937
Diffstat (limited to 'x11-misc/gestikk/files/gestikk-0.6-remove-libnotify.diff')
-rw-r--r--x11-misc/gestikk/files/gestikk-0.6-remove-libnotify.diff87
1 files changed, 87 insertions, 0 deletions
diff --git a/x11-misc/gestikk/files/gestikk-0.6-remove-libnotify.diff b/x11-misc/gestikk/files/gestikk-0.6-remove-libnotify.diff
new file mode 100644
index 000000000..29c5f6ce1
--- /dev/null
+++ b/x11-misc/gestikk/files/gestikk-0.6-remove-libnotify.diff
@@ -0,0 +1,87 @@
+diff -dupr gestikk-old/gestikk/start_main.py gestikk-0.6/gestikk/start_main.py
+--- gestikk-old/gestikk/start_main.py 2008-11-23 00:31:14.519650800 +0100
++++ gestikk-0.6/gestikk/start_main.py 2008-11-23 00:31:55.924650920 +0100
+@@ -31,9 +31,6 @@ import subprocess
+ import signal
+ import gtk
+ import gobject
+-import pynotify
+-if not pynotify.init("gestikk"):
+- print "Libnotify daemon error!"
+
+ import osd
+ from gestikk.tools import *
+@@ -102,26 +99,6 @@ class StatusIcon:
+ subprocess.Popen([get_file('gestikk', 'executable'), '-c', '-q'])
+
+
+-class Notifier:
+- """ class for notifying the user when a gesture started """
+- def __init__(self, logic, statusicon):
+- self.logic = logic
+- self.statusicon = statusicon
+-
+- def notify(self, s, gesture):
+- """ Notify and display `s`
+- :type s: String
+- """
+- notify = pynotify.Notification(_("Notification"), s.replace('<', '&lt;').replace('>', '&gt;'))
+- screen, rect, orient = self.statusicon.icon.get_geometry()
+- notify.set_hint("x", rect.x + (rect.width / 2))
+- notify.set_hint("y", rect.y + (rect.height / 2))
+- notify.set_timeout(3000) # timeout in ms
+- color = self.logic.config_get_option('OSD', 'color', '#0000FF')
+- pb = pixmap_to_pixbuf(gesture_to_pixmap(gesture2py(gesture), 40, color), (255, 255, 255))
+- notify.set_icon_from_pixbuf(pb)
+- notify.show()
+-
+ class Listener:
+ """ class for listening the mouse positions """
+ def __init__(self, logic, notifier, debugger):
+@@ -224,9 +201,8 @@ class Listener:
+ if action.check_condition():
+ action.do()
+ self.debugger.debug(self.notify_string(gesture_repr))
+- if self.notify_method == 'balloon' or self.notify_method == 'osd':
+- self.notifier.notify(action.get_formatted(), action.gesture)
+ if self.notify_method == 'osd':
++ self.notifier.notify(action.get_formatted(), action.gesture)
+ gobject.timeout_add(3000, self._osd_clear) # show it 2 sec
+ return self.running
+
+@@ -248,9 +224,7 @@ class Listener:
+ self.notify_method = self.logic.config_get_option('Notification', 'type')
+ if isinstance(self.notifier, osd.OSDNotifier):
+ self.notifier.destroy()
+- if self.notify_method == 'balloon':
+- self.notifier = Notifier(self.logic, self.logic.status_icon)
+- elif self.notify_method == 'osd':
++ if self.notify_method == 'osd':
+ notify_colorstr = self.logic.config_get_option('Notification', 'color', 'red')
+ notify_font = self.logic.config_get_option('Notification', 'font', 'Sans')
+ notify_fontsize = self.logic.config_get_option('Notification' , 'font_size', '20')
+@@ -269,11 +243,7 @@ def main(debug):
+ logic.status_icon = status # Not clean... TODO?
+ # get notifiers
+ notify_m = logic.config_get_option('Notification', 'type')
+- if notify_m == 'balloon':
+- debugger.debug("Using balloontip notification")
+- notifier = Notifier(logic, status)
+- osd_obj = False
+- elif notify_m == 'osd':
++ if notify_m == 'osd':
+ debugger.debug("Using OSD notification")
+ notify_colorstr = logic.config_get_option('Notification', 'color', 'red')
+ notify_font = logic.config_get_option('Notification', 'font', 'Sans')
+diff -dupr gestikk-old/gestikk/tools.py gestikk-0.6/gestikk/tools.py
+--- gestikk-old/gestikk/tools.py 2008-11-23 00:31:14.519650800 +0100
++++ gestikk-0.6/gestikk/tools.py 2008-11-23 00:31:07.654525360 +0100
+@@ -679,7 +679,7 @@ class Logic():
+ print 'You have chosen a gesture switcher which is not supported anymore. I\'ll reset it.'
+ self.current_switcher = 'rightdown'
+ self.current_switcher_txt = dict_rev(self.gesture_switchers_txt)[self.gesture_switchers.index(self.current_switcher)]
+- self.notifiers = {"0":_("None"), "balloon":_("Balloontip"), "osd":_("OSD")}
++ self.notifiers = {"0":_("None"), "osd":_("OSD")}
+
+ self.enable_conditions = True
+