Jeremy Bicha has proposed merging
lp:~jbicha/activity-log-manager/update-for-gnome-38 into
lp:activity-log-manager.
Requested reviews:
Activity Log Manager (activity-log-manager)
For more details, see:
https://code.launchpad.net/~jbicha/activity-log-manager/update-for-gnome-38/+merge/169077
GNOME Settings 3.8 expects panel in the form gnome-NAMEOFPANEL-panel.desktop.
--
https://code.launchpad.net/~jbicha/activity-log-manager/update-for-gnome-38/+merge/169077
Your team Activity Log Manager is requested to review the proposed merge of
lp:~jbicha/activity-log-manager/update-for-gnome-38 into
lp:activity-log-manager.
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2013-04-20 08:40:12 +0000
+++ data/Makefile.am 2013-06-12 23:34:23 +0000
@@ -23,7 +23,7 @@
desktopdir = $(datadir)/applications
if HAVE_CCPANEL
- desktop_in_files = activity-log-manager.desktop.in activity-log-manager-ccpanel.desktop.in
+ desktop_in_files = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in
else
desktop_in_files = activity-log-manager.desktop.in
endif
@@ -36,8 +36,8 @@
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = activity-log-manager.desktop.in activity-log-manager-ccpanel.desktop.in alm-switchboard.plug
-CLEANFILES = activity-log-manager.desktop activity-log-manager-ccpanel.desktop
+EXTRA_DIST = activity-log-manager.desktop.in gnome-activity-log-manager-panel.desktop.in alm-switchboard.plug
+CLEANFILES = activity-log-manager.desktop gnome-activity-log-manager-panel.desktop
check: $(desktop_DATA)
for desktop in $(desktop_DATA); do \
=== modified file 'data/activity-log-manager.desktop.in'
--- data/activity-log-manager.desktop.in 2012-11-12 02:06:34 +0000
+++ data/activity-log-manager.desktop.in 2013-06-12 23:34:23 +0000
@@ -12,3 +12,4 @@
Icon=activity-log-manager
Categories=GNOME;GTK;Utility;
+NotShowIn=Unity;
=== renamed file 'data/activity-log-manager-ccpanel.desktop.in' => 'data/gnome-activity-log-manager-panel.desktop.in'
--- data/activity-log-manager-ccpanel.desktop.in 2012-11-12 02:06:34 +0000
+++ data/gnome-activity-log-manager-panel.desktop.in 2013-06-12 23:34:23 +0000
@@ -14,7 +14,7 @@
Categories=GNOME;GTK;System;Archiving;Utility;Settings;X-GNOME-PersonalSettings;X-GNOME-Settings-Panel;
X-GNOME-Settings-Panel=activity-log-manager
-OnlyShowIn=GNOME;Unity;
+OnlyShowIn=Unity;
# Translators: Add whatever keywords you want in your language, separated by semicolons
# These keywords are used when searching for applications in dashes, etc.
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2013-04-19 06:59:09 +0000
+++ po/POTFILES.in 2013-06-12 23:34:23 +0000
@@ -1,5 +1,5 @@
-data/activity-log-manager-ccpanel.desktop.in
data/activity-log-manager.desktop.in
+data/gnome-activity-log-manager-panel.desktop.in
src/activity-log-manager.vala
src/alm.vala
src/alm-cc.c
_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help : https://help.launchpad.net/ListHelp
