Activity Log Manager

Merge lp:~jbicha/activity-log-manager/update-for-gnome-38 into lp:activity-log-manager

  1. update-for-gnome-38
  2. Merge into redesign
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 55
Proposed branch: lp:~jbicha/activity-log-manager/update-for-gnome-38
Merge into: lp:activity-log-manager
Diff against target: 56 lines (+6/-5)
4 files modified
data/Makefile.am (+3/-3)
data/activity-log-manager.desktop.in (+1/-0)
data/gnome-activity-log-manager-panel.desktop.in (+1/-1)
po/POTFILES.in (+1/-1)
To merge this branch: bzr merge lp:~jbicha/activity-log-manager/update-for-gnome-38
Reviewer Review Type Date Requested Status
Manish Sinha (मनीष सिन्हा) Approve
Review via email: mp+169077@code.launchpad.net

Description of the change

GNOME Settings 3.8 expects panel in the form gnome-NAMEOFPANEL-panel.desktop.

To post a comment you must log in.
Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

All well and good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2013-04-20 08:40:12 +0000
3+++ data/Makefile.am 2013-06-12 23:34:23 +0000
4@@ -23,7 +23,7 @@
5 desktopdir = $(datadir)/applications
6
7 if HAVE_CCPANEL
8- desktop_in_files = activity-log-manager.desktop.in activity-log-manager-ccpanel.desktop.in
9+ desktop_in_files = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in
10 else
11 desktop_in_files = activity-log-manager.desktop.in
12 endif
13@@ -36,8 +36,8 @@
14 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
15 @INTLTOOL_DESKTOP_RULE@
16
17-EXTRA_DIST = activity-log-manager.desktop.in activity-log-manager-ccpanel.desktop.in alm-switchboard.plug
18-CLEANFILES = activity-log-manager.desktop activity-log-manager-ccpanel.desktop
19+EXTRA_DIST = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in alm-switchboard.plug
20+CLEANFILES = activity-log-manager.desktop gnome-activity-log-manager-panel.desktop
21
22 check: $(desktop_DATA)
23 for desktop in $(desktop_DATA); do \
24
25=== modified file 'data/activity-log-manager.desktop.in'
26--- data/activity-log-manager.desktop.in 2012-11-12 02:06:34 +0000
27+++ data/activity-log-manager.desktop.in 2013-06-12 23:34:23 +0000
28@@ -12,3 +12,4 @@
29 Icon=activity-log-manager
30
31 Categories=GNOME;GTK;Utility;
32+NotShowIn=Unity;
33
34=== renamed file 'data/activity-log-manager-ccpanel.desktop.in' => 'data/gnome-activity-log-manager-panel.desktop.in'
35--- data/activity-log-manager-ccpanel.desktop.in 2012-11-12 02:06:34 +0000
36+++ data/gnome-activity-log-manager-panel.desktop.in 2013-06-12 23:34:23 +0000
37@@ -14,7 +14,7 @@
38 Categories=GNOME;GTK;System;Archiving;Utility;Settings;X-GNOME-PersonalSettings;X-GNOME-Settings-Panel;
39 X-GNOME-Settings-Panel=activity-log-manager
40
41-OnlyShowIn=GNOME;Unity;
42+OnlyShowIn=Unity;
43
44 # Translators: Add whatever keywords you want in your language, separated by semicolons
45 # These keywords are used when searching for applications in dashes, etc.
46
47=== modified file 'po/POTFILES.in'
48--- po/POTFILES.in 2013-04-19 06:59:09 +0000
49+++ po/POTFILES.in 2013-06-12 23:34:23 +0000
50@@ -1,5 +1,5 @@
51-data/activity-log-manager-ccpanel.desktop.in
52 data/activity-log-manager.desktop.in
53+data/gnome-activity-log-manager-panel.desktop.in
54 src/activity-log-manager.vala
55 src/alm.vala
56 src/alm-cc.c

Subscribers

People subscribed via source and target branches