diff options
| author | Stefano Karapetsas <[email protected]> | 2013-08-02 01:00:47 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-08-02 01:00:47 +0200 |
| commit | 5064f93879706df73c8ce9fa6c5ae4b74cdad37c (patch) | |
| tree | a9a350040fbb76bcf4aacf1b0a97082fcd6a392b /src | |
| parent | 3be92767b85acabf1f30e010cca425d322b89de2 (diff) | |
| parent | 74afe20a5373c92718731e205008c1d2c55fc47c (diff) | |
| download | mate-power-manager-5064f93879706df73c8ce9fa6c5ae4b74cdad37c.tar.bz2 mate-power-manager-5064f93879706df73c8ce9fa6c5ae4b74cdad37c.tar.xz | |
Merge branch 'dev-gnome-keyring'
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpm-control.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gpm-control.c b/src/gpm-control.c index cb84814..8253336 100644 --- a/src/gpm-control.c +++ b/src/gpm-control.c @@ -42,7 +42,7 @@ #include <libupower-glib/upower.h> #ifdef WITH_KEYRING -#include <mate-keyring.h> +#include <gnome-keyring.h> #endif /* WITH_KEYRING */ #include "egg-debug.h" @@ -212,8 +212,8 @@ gpm_control_suspend (GpmControl *control, GError **error) GpmScreensaver *screensaver; guint32 throttle_cookie = 0; #ifdef WITH_KEYRING - gboolean lock_mate_keyring; - MateKeyringResult keyres; + gboolean lock_gnome_keyring; + GnomeKeyringResult keyres; #endif /* WITH_KEYRING */ GError *dbus_error = NULL; @@ -234,10 +234,10 @@ gpm_control_suspend (GpmControl *control, GError **error) #ifdef WITH_KEYRING /* we should perhaps lock keyrings when sleeping #375681 */ - lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); - if (lock_mate_keyring) { - keyres = mate_keyring_lock_all_sync (); - if (keyres != MATE_KEYRING_RESULT_OK) + lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND); + if (lock_gnome_keyring) { + keyres = gnome_keyring_lock_all_sync (); + if (keyres != GNOME_KEYRING_RESULT_OK) egg_warning ("could not lock keyring"); } #endif /* WITH_KEYRING */ @@ -323,8 +323,8 @@ gpm_control_hibernate (GpmControl *control, GError **error) GpmScreensaver *screensaver; guint32 throttle_cookie = 0; #ifdef WITH_KEYRING - gboolean lock_mate_keyring; - MateKeyringResult keyres; + gboolean lock_gnome_keyring; + GnomeKeyringResult keyres; #endif /* WITH_KEYRING */ GError *dbus_error = NULL; @@ -345,10 +345,10 @@ gpm_control_hibernate (GpmControl *control, GError **error) #ifdef WITH_KEYRING /* we should perhaps lock keyrings when sleeping #375681 */ - lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE); - if (lock_mate_keyring) { - keyres = mate_keyring_lock_all_sync (); - if (keyres != MATE_KEYRING_RESULT_OK) { + lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE); + if (lock_gnome_keyring) { + keyres = gnome_keyring_lock_all_sync (); + if (keyres != GNOME_KEYRING_RESULT_OK) { egg_warning ("could not lock keyring"); } } |