aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2015-10-05 18:44:19 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-10-05 18:44:19 +0000
commit5d36e8d4596cd8abd77179c5a8f97cc1155008ca (patch)
tree73b03def6bf50844a9fa8801991466cdbae900e8 /src
parentff85d7e0e21439d5f30f4993671dc58ecd760184 (diff)
parentb8a77a03be9574a59d397b3ffa37cd3fa17a1aa9 (diff)
downloadayatana-indicator-power-5d36e8d4596cd8abd77179c5a8f97cc1155008ca.tar.gz
ayatana-indicator-power-5d36e8d4596cd8abd77179c5a8f97cc1155008ca.tar.bz2
ayatana-indicator-power-5d36e8d4596cd8abd77179c5a8f97cc1155008ca.zip
under unity8 start system-settings instead unity-control-center Fixes: #1489482
Approved by: Charles Kerr, PS Jenkins bot
Diffstat (limited to 'src')
-rw-r--r--src/service.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/service.c b/src/service.c
index f0b3ef9..cd0f24e 100644
--- a/src/service.c
+++ b/src/service.c
@@ -783,7 +783,12 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED,
if (control_center_cmd == NULL)
{
- if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
+ if (g_getenv ("MIR_SOCKET") != NULL)
+ {
+ url_dispatch_send("settings:///system/battery", NULL, NULL);
+ return;
+ }
+ else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "xubuntu"))
{
control_center_cmd = "xfce4-power-manager-settings";
}