gnome-mag r737 - in trunk: . colorblind

[wwalker svn gnome org]

Author: wwalker
Date: Sat Apr  4 14:56:25 2009
New Revision: 737
URL: http://svn.gnome.org/viewvc/gnome-mag?rev=737&view=rev

Log:
Fix for bug #577937 - colorblind applet does not run


Modified:
   trunk/ChangeLog
   trunk/colorblind/Keybinder.py
   trunk/colorblind/Makefile.am

Modified: trunk/colorblind/Keybinder.py
==============================================================================
--- trunk/colorblind/Keybinder.py	(original)
+++ trunk/colorblind/Keybinder.py	Sat Apr  4 14:56:25 2009
@@ -38,7 +38,7 @@
 			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
 		

Modified: trunk/colorblind/Makefile.am
==============================================================================
--- trunk/colorblind/Makefile.am	(original)
+++ trunk/colorblind/Makefile.am	Sat Apr  4 14:56:25 2009
@@ -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