diff options
| author | William Walker <wwalker@src.gnome.org> | 2009-04-04 14:56:25 +0000 |
|---|---|---|
| committer | William Walker <wwalker@src.gnome.org> | 2009-04-04 14:56:25 +0000 |
| commit | 814c2e8fdafecc673ba4c71423413b618ae23223 (patch) | |
| tree | d6cddd0951b85ca77bff9368da6d4f547fdaa2bd | |
| parent | a7d674d483ab6d8a1d70bd79d57991d93bec28b6 (diff) | |
Fix for bug #577937 - colorblind applet does not run
svn path=/trunk/; revision=737
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | colorblind/Keybinder.py | 2 | ||||
| -rw-r--r-- | colorblind/Makefile.am | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,15 @@ +2009-04-04 Willie Walker <william.walker@sun.com> + + * colorblind/Makefile.an: set PYTHONPATH to site-packages. + Note that setting the PYTHONPATH in this case probably + isn't fully necessary, but I didn't want to change too much. + * colorblind/Keybinder.py: check for TypeError in addition to + KeyError. + + NOTE: these changes were to get the colorblind applet to run. + I'm not quite sure what it does when it is run, though. I don't + see any visual changes on the screen when I run it. + 2009-03-12 Willie Walker <william.walker@sun.com> * NEWS: additional notes for Version 0.15.5. diff --git a/colorblind/Keybinder.py b/colorblind/Keybinder.py index 2fa6210..7880e3a 100644 --- a/colorblind/Keybinder.py +++ b/colorblind/Keybinder.py @@ -38,7 +38,7 @@ class Keybinder(gobject.GObject): print 'Binding Global shortcut %s to focus the colorblind' % self.keybinding colorblind.keybinder.tomboy_keybinder_bind(self.keybinding, self.on_keyboard_shortcut) self.bound = True - except KeyError: + except (KeyError, TypeError): # if the requested keybinding conflicts with an existing one, a KeyError will be thrown self.bound = False diff --git a/colorblind/Makefile.am b/colorblind/Makefile.am index c24a378..4598471 100644 --- a/colorblind/Makefile.am +++ b/colorblind/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = ui osutils data keybinder colorblind-applet: colorblind-applet.py - sed -e "s|\@PYTHONDIR\@|$(pythondir)/colorblind|" $< > $@ + sed -e "s|\@PYTHONDIR\@|$(pythondir)|" $< > $@ colorblindbindir = $(libdir)/colorblind-applet colorblindbin_SCRIPTS = colorblind-applet |