From 4ba6d06e004fcf316defc8e10280640f581039bd Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Sat, 15 Mar 2014 03:30:23 -0500 Subject: Add support for Switchboard when in Pantheon session to fix bug #1291051 --- src/service.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/service.c b/src/service.c index 1d8ba3e..f41b3a7 100644 --- a/src/service.c +++ b/src/service.c @@ -717,6 +717,10 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, { control_center_cmd = "xfce4-power-manager-settings"; } + else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "pantheon")) + { + control_center_cmd = "switchboard --open-plug system-pantheon-power"; + } else { gchar *path; -- cgit v1.2.3 From d08ca4483294f7c8834a5a24d073bcf1aad613d3 Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Mon, 24 Mar 2014 15:29:01 -0500 Subject: Add switchboard-plug-power as an alternative recommendation in packaging --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b11fd60..db36366 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, upower, Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | xfce4-power-manager, - indicator-applet (>= 0.2) | indicator-renderer, + indicator-applet (>= 0.2) | switchboard-plug-power | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives the user a way to access power management preferences. -- cgit v1.2.3 From 3a9c255fccec13b9df0f9f985d66de33ed6d2119 Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Wed, 9 Apr 2014 01:42:05 -0500 Subject: Correct packaging --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index db36366..fa86f1d 100644 --- a/debian/control +++ b/debian/control @@ -24,8 +24,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, upower, -Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | xfce4-power-manager, - indicator-applet (>= 0.2) | switchboard-plug-power | indicator-renderer, +Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | switchboard-plug-power | xfce4-power-manager, + indicator-applet (>= 0.2) | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives the user a way to access power management preferences. -- cgit v1.2.3 From 96b41245b927453554efd3caf7a7776b6b94eaeb Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Wed, 9 Apr 2014 03:28:01 -0500 Subject: Use XDG_CURRENT_DESKTOP instead --- src/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c index f41b3a7..54347e8 100644 --- a/src/service.c +++ b/src/service.c @@ -717,7 +717,7 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, { control_center_cmd = "xfce4-power-manager-settings"; } - else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "pantheon")) + else if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "pantheon")) { control_center_cmd = "switchboard --open-plug system-pantheon-power"; } -- cgit v1.2.3 From 27fa89271d54f2977f4dfed305d5eadf360f37ce Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Wed, 9 Apr 2014 04:28:37 -0500 Subject: Uppercase Pantheon --- src/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service.c b/src/service.c index 54347e8..f22d33d 100644 --- a/src/service.c +++ b/src/service.c @@ -717,7 +717,7 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, { control_center_cmd = "xfce4-power-manager-settings"; } - else if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "pantheon")) + else if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Pantheon")) { control_center_cmd = "switchboard --open-plug system-pantheon-power"; } -- cgit v1.2.3