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

Proposed by Andrew Starr-Bochicchio on 2010-06-23
Status: Merged
Merged at revision: 75
Proposed branch: lp:~andrewsomething/gm-notify/lp-597407
Merge into: lp:gm-notify
Diff against target: 52 lines (+5/-5)
2 files modified
gm-notify (+3/-3)
gm-notify-config (+2/-2)
To merge this branch: bzr merge lp:~andrewsomething/gm-notify/lp-597407
Reviewer Review Type Date Requested Status
Alexander Hungenberg (community) 2010-06-23 Approve on 2010-06-23
Review via email: mp+28263@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

oh - indeed :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gm-notify'
2--- gm-notify 2010-06-22 19:46:39 +0000
3+++ gm-notify 2010-06-23 04:52:29 +0000
4@@ -1,7 +1,7 @@
5 #!/usr/bin/env python
6 # -*- coding: utf-8 -*-
7
8-# gm-notify.py v0.10.2
9+# gm-notify v0.10.2
10 # a simple and lightweight GMail-Notifier for ubuntu and notify-osd
11 #
12 # Copyright (c) 2009-2010, Alexander Hungenberg <alexander.hungenberg@gmail.com>
13@@ -62,7 +62,7 @@
14 In the end it starts the periodic check timer and a gtk main-loop'''
15
16 # Kill running gm-notify processes (UGLY!)
17- subprocess.call("kill `pgrep -f gm-notify.py | grep -v %s`" % os.getpid(), stdout=open("/dev/null", "w"), shell=True)
18+ subprocess.call("kill `pgrep -f gm-notify | grep -v %s`" % os.getpid(), stdout=open("/dev/null", "w"), shell=True)
19
20 # Initiate pynotify and Gnome Keyring
21 if not pynotify.init(_("GMail Notifier")):
22@@ -74,7 +74,7 @@
23 else:
24 # Start gm-notify-config if no credentials are found
25 try:
26- subprocess.call(get_executable_path("gm-notify-config.py"))
27+ subprocess.call(get_executable_path("gm-notify-config"))
28 except PathNotFound:
29 print(_("gm-notify-config utility was not found"))
30 sys.exit(-1)
31
32=== modified file 'gm-notify-config'
33--- gm-notify-config 2010-06-22 19:46:39 +0000
34+++ gm-notify-config 2010-06-23 04:52:29 +0000
35@@ -1,7 +1,7 @@
36 #!/usr/bin/env python
37 # -*- coding: utf-8 -*-
38
39-# gm-notify-config.py v0.10.2
40+# gm-notify-config v0.10.2
41 # GMail Notifier Configuration Utility
42 #
43 # Copyright (c) 2009-2010, Alexander Hungenberg <alexander.hungenberg@gmail.com>
44@@ -172,7 +172,7 @@
45 print "Warning: cannot delete", self.autostart_file
46
47 # Start gm-notify itself
48- subprocess.Popen(get_executable_path("gm-notify.py"))
49+ subprocess.Popen(get_executable_path("gm-notify"))
50
51 def terminate(self, widget):
52 reactor.stop()

Subscribers

People subscribed via source and target branches

to status/vote changes: