diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-17 01:14:24 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-17 01:14:24 -0700 |
| commit | c72dc5de577922ea7f6002cdabcfac1576eae211 (patch) | |
| tree | 3b8c1ab907b1575184230eb1adc05e26e3a1b87a /extra/gnome-settings-daemon | |
| parent | c22d00d6478c9a00b4c7e491af65637537247c8f (diff) | |
Thu Oct 17 01:13:29 PDT 2013
Diffstat (limited to 'extra/gnome-settings-daemon')
| -rw-r--r-- | extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch | 77 | ||||
| -rw-r--r-- | extra/gnome-settings-daemon/PKGBUILD | 6 |
2 files changed, 3 insertions, 80 deletions
diff --git a/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch b/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch deleted file mode 100644 index 7e678f936..000000000 --- a/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Mon, 5 Aug 2013 18:15:00 +0200 -Subject: [PATCH] power: Use logind to discover critical action availability - -The upower functionality is deprecated and will return an -error unless upower is built with --enable-deprecated. - -Follows a similar patch to gnome-control-center. ---- - plugins/power/gsd-power-manager.c | 42 ++++++++++++++++++++++++++++----------- - 1 file changed, 30 insertions(+), 12 deletions(-) - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index fde90ef..8bd124f 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -27,7 +27,6 @@ - #include <string.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> --#define UPOWER_ENABLE_DEPRECATED 1 - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> - #include <canberra-gtk.h> -@@ -1164,18 +1163,37 @@ static GsdPowerActionType - manager_critical_action_get (GsdPowerManager *manager, - gboolean is_ups) - { -- GsdPowerActionType policy; -+ GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN; -+ GsdPowerActionType setpolicy; -+ GVariant *result = NULL; -+ gchar *s; - -- policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); -- if (policy == GSD_POWER_ACTION_SUSPEND) { -- if (is_ups == FALSE && -- up_client_get_can_suspend (manager->priv->up_client)) -- return policy; -- return GSD_POWER_ACTION_SHUTDOWN; -- } else if (policy == GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_can_hibernate (manager->priv->up_client)) -- return policy; -- return GSD_POWER_ACTION_SHUTDOWN; -+ setpolicy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); -+ -+ if (setpolicy == GSD_POWER_ACTION_SUSPEND) { -+ if (is_ups == FALSE) { -+ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, -+ "CanSuspend", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); -+ } -+ } else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) { -+ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, -+ "CanHibernate", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); -+ } else { -+ /* Other actions need no check */ -+ return setpolicy; -+ } -+ -+ if (result) { -+ g_variant_get (result, "(s)", &s); -+ if (g_strcmp0 (s, "yes") == 0) -+ policy = setpolicy; -+ g_variant_unref (result); - } - - return policy; --- -1.8.3.4 - diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index ab2fb0e77..b39a8a40e 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196078 2013-10-07 11:51:53Z jgc $ +# $Id: PKGBUILD 196641 2013-10-15 22:22:07Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005') +sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31') build() { cd $pkgname-$pkgver |