diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-10-19 23:58:34 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-11-07 17:18:21 +0100 |
| commit | 6ffc07f87a09deeaa4bbd6156fc1dbd733d4ab27 (patch) | |
| tree | 2f1ce7623618b81f33641dc394de340fa59b4ed7 /plugins | |
| parent | 517e2d6aea3d1beab4ded4cc83e54fee2acf126d (diff) | |
| download | gnome-settings-daemon-6ffc07f87a09deeaa4bbd6156fc1dbd733d4ab27.tar.gz | |
media-keys: Merge power_action_* functions
They only differed by a single line.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/media-keys/gsd-media-keys-manager.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c index 93cf14e3..2c46d741 100644 --- a/plugins/media-keys/gsd-media-keys-manager.c +++ b/plugins/media-keys/gsd-media-keys-manager.c @@ -1766,22 +1766,11 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) } static void -power_action_suspend (GsdMediaKeysManager *manager) +power_action (GsdMediaKeysManager *manager, + const char *action) { g_dbus_proxy_call (manager->priv->logind_proxy, - "Suspend", - g_variant_new ("(b)", TRUE), - G_DBUS_CALL_FLAGS_NONE, - G_MAXINT, - manager->priv->bus_cancellable, - NULL, NULL); -} - -static void -power_action_hibernate (GsdMediaKeysManager *manager) -{ - g_dbus_proxy_call (manager->priv->logind_proxy, - "Hibernate", + action, g_variant_new ("(b)", TRUE), G_DBUS_CALL_FLAGS_NONE, G_MAXINT, @@ -1799,14 +1788,14 @@ do_config_power_action (GsdMediaKeysManager *manager, config_key); switch (action_type) { case GSD_POWER_ACTION_SUSPEND: - power_action_suspend (manager); + power_action (manager, "Suspend"); break; case GSD_POWER_ACTION_INTERACTIVE: case GSD_POWER_ACTION_SHUTDOWN: gnome_session_shutdown (manager); break; case GSD_POWER_ACTION_HIBERNATE: - power_action_hibernate (manager); + power_action (manager, "Hibernate"); break; case GSD_POWER_ACTION_BLANK: case GSD_POWER_ACTION_NOTHING: |