Merge lp:~andrewsomething/gm-notify/lp-597407 into lp:gm-notify

[Andrew Starr-Bochicchio]

Hi Alexander,

Thanks for your quick response before. Unfotunetly, I just noticed that my patch was not complete. There were a few subprocess calls that needed renaming as well. This branch should finish it off.

[Alexander Hungenberg (alexander-hungenberg-gmail)]

oh - indeed :-)

review: Approve

=== modified file 'gm-notify'
--- gm-notify	2010-06-22 19:46:39 +0000
+++ gm-notify	2010-06-23 04:52:29 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# gm-notify.py v0.10.2
+# gm-notify v0.10.2
 # a simple and lightweight GMail-Notifier for ubuntu and notify-osd
 #
 # Copyright (c) 2009-2010, Alexander Hungenberg <[e-mail]>
@@ -62,7 +62,7 @@
         In the end it starts the periodic check timer and a gtk main-loop'''
         
         # Kill running gm-notify processes (UGLY!)
-        subprocess.call("kill `pgrep -f gm-notify.py | grep -v %s`" % os.getpid(), stdout=open("/dev/null", "w"), shell=True)
+        subprocess.call("kill `pgrep -f gm-notify | grep -v %s`" % os.getpid(), stdout=open("/dev/null", "w"), shell=True)
         
         # Initiate pynotify and Gnome Keyring
         if not pynotify.init(_("GMail Notifier")):
@@ -74,7 +74,7 @@
         else:
             # Start gm-notify-config if no credentials are found
             try:
-                subprocess.call(get_executable_path("gm-notify-config.py"))
+                subprocess.call(get_executable_path("gm-notify-config"))
             except PathNotFound:
                 print(_("gm-notify-config utility was not found"))
             sys.exit(-1)
 
=== modified file 'gm-notify-config'
--- gm-notify-config	2010-06-22 19:46:39 +0000
+++ gm-notify-config	2010-06-23 04:52:29 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# gm-notify-config.py v0.10.2
+# gm-notify-config v0.10.2
 # GMail Notifier Configuration Utility
 #
 # Copyright (c) 2009-2010, Alexander Hungenberg <[e-mail]>
@@ -172,7 +172,7 @@
                     print "Warning: cannot delete", self.autostart_file
 
         # Start gm-notify itself
-        subprocess.Popen(get_executable_path("gm-notify.py"))
+        subprocess.Popen(get_executable_path("gm-notify"))
     
     def terminate(self, widget):
         reactor.stop()