diff options
| author | Ubuntu MATE Developers <code@ubuntu-mate.org> | 2015-04-02 20:30:52 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-04-02 20:30:52 +0000 |
| commit | e332c6b358df2e47e329b8465c30f184516f1e80 (patch) | |
| tree | d895ace7b962d22002d55568822167af09a5b7a5 | |
| parent | e7a6c33ca20280653ff9a04bb5341b8d3822caf7 (diff) | |
| parent | 5838f6d868e6d395917dd104d1fccb6ca739a6a4 (diff) | |
| download | ayatana-indicator-power-e332c6b358df2e47e329b8465c30f184516f1e80.tar.gz ayatana-indicator-power-e332c6b358df2e47e329b8465c30f184516f1e80.tar.bz2 ayatana-indicator-power-e332c6b358df2e47e329b8465c30f184516f1e80.zip | |
This merge proposal adds support for MATE Desktop.
Approved by: Ted Gould
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/service.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/control b/debian/control index ef641b4..20869e3 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, upower, -Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | switchboard-plug-power | xfce4-power-manager, +Recommends: unity-control-center | gnome-control-center (>= 3.1) | ubuntu-system-settings | switchboard-plug-power | xfce4-power-manager | mate-power-manager, indicator-applet (>= 0.2) | indicator-renderer, Suggests: powerd, unity-system-compositor (>= 0.0.4), diff --git a/src/service.c b/src/service.c index 9ac559b..602caba 100644 --- a/src/service.c +++ b/src/service.c @@ -769,6 +769,10 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, { control_center_cmd = "xfce4-power-manager-settings"; } + else if (!g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "mate")) + { + control_center_cmd = "mate-power-preferences"; + } else if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Pantheon")) { control_center_cmd = "switchboard --open-plug system-pantheon-power"; |