aboutsummaryrefslogtreecommitdiff
path: root/src/service.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:08:35 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:08:35 -0600
commite9eb4115d28afa01e54e9460791657753a25ef13 (patch)
tree5c798cbe99c2bfc2c40c6d49f663b2d9891c6805 /src/service.c
parentef84548e3025184c4f631a23fceefb008dd6968b (diff)
parent012768daf0bd8bb92a5fe525af359ff659e02134 (diff)
downloadayatana-indicator-datetime-e9eb4115d28afa01e54e9460791657753a25ef13.tar.gz
ayatana-indicator-datetime-e9eb4115d28afa01e54e9460791657753a25ef13.tar.bz2
ayatana-indicator-datetime-e9eb4115d28afa01e54e9460791657753a25ef13.zip
merge lp:~robert-ancell/indicator-datetime/call-ucc into lp:indicator-datetime
Diffstat (limited to 'src/service.c')
-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