Merge lp:~rmyeid/gm-notify/setupFix into lp:gm-notify

[Rami Al-Rfou']

Fixed the typos in the setup file and the bug in the configuration window.

[Alexander Hungenberg (alexander-hungenberg-gmail)]

this looks good ;)

review: Approve

=== modified file 'gm-notify-config.py'
--- gm-notify-config.py	2010-03-31 21:04:32 +0000
+++ gm-notify-config.py	2010-04-01 12:02:18 +0000
@@ -91,7 +91,8 @@
         
         # Sound
         self.wTree.get_widget("checkbutton_sound").set_active(self.client.get_bool("/apps/gm-notify/play_sound"))
-        self.wTree.get_widget("fcbutton_sound").set_filename(self.client.get_string("/apps/gm-notify/soundfile"))
+        if self.client.get_string("/apps/gm-notify/soundfile"):
+            self.wTree.get_widget("fcbutton_sound").set_filename(self.client.get_string("/apps/gm-notify/soundfile"))
         self.on_checkbutton_sound_toggled(self.wTree.get_widget("checkbutton_sound"))
         
         # ClickAction
 
=== modified file 'setup.py'
--- setup.py	2010-03-31 21:04:32 +0000
+++ setup.py	2010-04-01 12:02:18 +0000
@@ -11,7 +11,7 @@
         scripts=['gm-notify.py', 'gm-notify-config.py'],
         data_files=[('/usr/share/applications', ['data/gm-notify.desktop']),
                     ('/usr/share/applications', ['data/gm-notify-config.desktop']),
-                    ('/usr/share/indicators/messages/applications', ['data/gm-notify.py'])
+                    ('/usr/share/indicators/messages/applications', ['data/gm-notify.py']),
                     ('/usr/share/gm-notify', ['data/checking.gif']),
                     ('/usr/share/icons/hicolor/16x16/apps/', ['data/gm-notify.png']),
                     ('/usr/share/gm-notify', ['gm-config.glade']),