aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-01-22 17:45:59 +0000
committerTarmac <Unknown>2014-01-22 17:45:59 +0000
commitfec43cc11663f45102e6bb79ca483b8de0fe76bd (patch)
tree2fddbdfcfcaa06efd5b13a168795e061f208dc83
parent4a8f2d77ab357fe62db2a0577db4666e785c06bb (diff)
parent012768daf0bd8bb92a5fe525af359ff659e02134 (diff)
downloadayatana-indicator-datetime-fec43cc11663f45102e6bb79ca483b8de0fe76bd.tar.gz
ayatana-indicator-datetime-fec43cc11663f45102e6bb79ca483b8de0fe76bd.tar.bz2
ayatana-indicator-datetime-fec43cc11663f45102e6bb79ca483b8de0fe76bd.zip
Run the unity-control-center panel under Unity. Rename the unity panel to just "datetime".
Approved by Ted Gould, PS Jenkins bot.
-rw-r--r--data/unity-datetime-panel.desktop.in4
-rw-r--r--src/service.c16
2 files changed, 16 insertions, 4 deletions
diff --git a/data/unity-datetime-panel.desktop.in b/data/unity-datetime-panel.desktop.in
index 6e7b252..f3f7c22 100644
--- a/data/unity-datetime-panel.desktop.in
+++ b/data/unity-datetime-panel.desktop.in
@@ -4,10 +4,10 @@ _Name=Time & Date
_Comment=Change your clock and date settings
Icon=preferences-system-time
TryExec=unity-control-center
-Exec=unity-control-center indicator-datetime
+Exec=unity-control-center datetime
StartupNotify=true
Type=Application
Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-Unity-Settings-Panel;
-X-Unity-Settings-Panel=indicator-datetime
+X-Unity-Settings-Panel=datetime
OnlyShowIn=Unity;
X-Ubuntu-Gettext-Domain=indicator-datetime
diff --git a/src/service.c b/src/service.c
index 246ea70..746ced9 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1466,11 +1466,23 @@ on_desktop_settings_activated (GSimpleAction * a G_GNUC_UNUSED,
GVariant * param G_GNUC_UNUSED,
gpointer gself G_GNUC_UNUSED)
{
+ gchar *path;
+
+ path = g_find_program_in_path ("unity-control-center");
+ if (path != NULL && g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0)
+ {
+ execute_command ("unity-control-center datetime");
+ }
+ else
+ {
#ifdef HAVE_CCPANEL
- execute_command ("gnome-control-center indicator-datetime");
+ execute_command ("gnome-control-center indicator-datetime");
#else
- execute_command ("gnome-control-center datetime");
+ execute_command ("gnome-control-center datetime");
#endif
+ }
+
+ g_free (path);
}
static void