aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-01-22 10:47:02 +1300
committerRobert Ancell <robert.ancell@canonical.com>2014-01-22 10:47:02 +1300
commit012768daf0bd8bb92a5fe525af359ff659e02134 (patch)
tree2fddbdfcfcaa06efd5b13a168795e061f208dc83 /src
parent4a8f2d77ab357fe62db2a0577db4666e785c06bb (diff)
downloadayatana-indicator-datetime-012768daf0bd8bb92a5fe525af359ff659e02134.tar.gz
ayatana-indicator-datetime-012768daf0bd8bb92a5fe525af359ff659e02134.tar.bz2
ayatana-indicator-datetime-012768daf0bd8bb92a5fe525af359ff659e02134.zip
Run the unity-control-center panel under Unity. Rename the unity panel to just "datetime"
Diffstat (limited to 'src')
-rw-r--r--src/service.c16
1 files changed, 14 insertions, 2 deletions
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