[gnome-settings-daemon] media-keys: Use new power state helpers
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] media-keys: Use new power state helpers
- Date: Thu, 14 Jun 2012 16:44:44 +0000 (UTC)
commit e5bc75af0ef52bb0bd34597c07fa4b4c0fb92ea4
Author: Bastien Nocera <hadess hadess net>
Date: Thu Jun 14 17:41:20 2012 +0100
media-keys: Use new power state helpers
https://bugzilla.gnome.org/show_bug.cgi?id=677241
plugins/media-keys/gsd-media-keys-manager.c | 35 ++------------------------
1 files changed, 3 insertions(+), 32 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 7578ff2..73af48b 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -51,6 +51,7 @@
#include "shortcuts-list.h"
#include "gsd-osd-window.h"
#include "gsd-input-helper.h"
+#include "gsd-power-helper.h"
#include "gsd-enums.h"
#include <canberra.h>
@@ -1619,26 +1620,6 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
}
static void
-upower_sleep_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
-{
- GVariant *result;
- GError *error = NULL;
-
- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
- res,
- &error);
- if (result == NULL) {
- g_warning ("couldn't sleep using UPower: %s",
- error->message);
- g_error_free (error);
- } else {
- g_variant_unref (result);
- }
-}
-
-static void
do_config_power_action (GsdMediaKeysManager *manager,
const gchar *config_key)
{
@@ -1648,24 +1629,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
config_key);
switch (action_type) {
case GSD_POWER_ACTION_SUSPEND:
- g_dbus_proxy_call (manager->priv->upower_proxy,
- "Suspend",
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1, NULL,
- upower_sleep_cb, NULL);
+ gsd_power_suspend (manager->priv->upower_proxy);
break;
case GSD_POWER_ACTION_INTERACTIVE:
case GSD_POWER_ACTION_SHUTDOWN:
gnome_session_shutdown (manager);
break;
case GSD_POWER_ACTION_HIBERNATE:
- g_dbus_proxy_call (manager->priv->upower_proxy,
- "Hibernate",
- NULL,
- G_DBUS_CALL_FLAGS_NONE,
- -1, NULL,
- upower_sleep_cb, NULL);
+ gsd_power_hibernate (manager->priv->upower_proxy);
break;
case GSD_POWER_ACTION_BLANK:
case GSD_POWER_ACTION_NOTHING:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]