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

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 74
Proposed branch: lp:~andrewsomething/gm-notify/lp-597407
Merge into: lp:gm-notify
Diff against target: 38 lines (+3/-3)
3 files modified
data/gm-notify-config.desktop (+1/-1)
data/gm-notify.desktop (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/gm-notify/lp-597407
Reviewer Review Type Date Requested Status
Alexander Hungenberg (community) Approve
Review via email: mp+28235@code.launchpad.net

Description of the change

To post a comment you must log in.
74. By Alexander Hungenberg <defreng@defreng-netbook>

Merge Andrews branch to fix Bug #597407

Revision history for this message
Alexander Hungenberg (alexander-hungenberg-gmail) wrote :

thx

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/gm-notify-config.desktop'
--- data/gm-notify-config.desktop 2009-04-25 21:12:44 +0000
+++ data/gm-notify-config.desktop 2010-06-22 19:48:30 +0000
@@ -5,6 +5,6 @@
5Icon=evolution5Icon=evolution
6Type=Application6Type=Application
7Categories=GNOME;GTK;Settings;DesktopSettings;7Categories=GNOME;GTK;Settings;DesktopSettings;
8Exec=gm-notify-config.py8Exec=gm-notify-config
9StartupNotify=False9StartupNotify=False
10Terminal=false10Terminal=false
1111
=== modified file 'data/gm-notify.desktop'
--- data/gm-notify.desktop 2010-05-03 19:12:13 +0000
+++ data/gm-notify.desktop 2010-06-22 19:48:30 +0000
@@ -4,6 +4,6 @@
4Comment=An E-Mail Notifier for Google Mail4Comment=An E-Mail Notifier for Google Mail
5Icon=applications-email-panel5Icon=applications-email-panel
6Type=Application6Type=Application
7Exec=gm-notify.py7Exec=gm-notify
8StartupNotify=False8StartupNotify=False
9Terminal=false9Terminal=false
1010
=== renamed file 'gm-notify.py' => 'gm-notify'
=== renamed file 'gm-notify-config.py' => 'gm-notify-config'
=== modified file 'setup.py'
--- setup.py 2010-05-05 19:51:23 +0000
+++ setup.py 2010-06-22 19:48:30 +0000
@@ -8,7 +8,7 @@
8 author='Alexander Hungenberg',8 author='Alexander Hungenberg',
9 author_email='alexander.hungenberg@gmail.com',9 author_email='alexander.hungenberg@gmail.com',
10 py_modules=['gtalk', 'gm_notify_keyring'],10 py_modules=['gtalk', 'gm_notify_keyring'],
11 scripts=['gm-notify.py', 'gm-notify-config.py'],11 scripts=['gm-notify', 'gm-notify-config'],
12 data_files=[('/usr/share/applications', ['data/gm-notify-config.desktop']),12 data_files=[('/usr/share/applications', ['data/gm-notify-config.desktop']),
13 ('/usr/share/indicators/messages/applications', ['data/gm-notify']),13 ('/usr/share/indicators/messages/applications', ['data/gm-notify']),
14 ('/usr/share/gm-notify', ['data/gm-notify.desktop']),14 ('/usr/share/gm-notify', ['data/gm-notify.desktop']),

Subscribers

People subscribed via source and target branches

to status/vote changes: