summaryrefslogtreecommitdiff
path: root/src/gpm-control.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-07-23 01:46:09 -0700
committerStefano Karapetsas <[email protected]>2013-07-23 01:46:09 -0700
commit74afe20a5373c92718731e205008c1d2c55fc47c (patch)
treecf5ae8522343cb3bbe8bb8b2c6ddabf7e1294c13 /src/gpm-control.c
parent6ebb90a3029238c6d57fc67fd3ba2d2fbc4065a8 (diff)
parent46af2e42fde98dc58d735887688c70ae2a3d83cd (diff)
downloadmate-power-manager-74afe20a5373c92718731e205008c1d2c55fc47c.tar.bz2
mate-power-manager-74afe20a5373c92718731e205008c1d2c55fc47c.tar.xz
Merge pull request #65 from NiceandGently/dev-gnome-keyring
switch to gnome-keyring
Diffstat (limited to 'src/gpm-control.c')
-rw-r--r--src/gpm-control.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gpm-control.c b/src/gpm-control.c
index 71f857c..19b16db 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"
@@ -163,8 +163,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 */
#ifdef WITH_SYSTEMD_SLEEP
GError *dbus_error = NULL;
@@ -186,10 +186,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 */
@@ -274,8 +274,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 */
#ifdef WITH_SYSTEMD_SLEEP
@@ -298,10 +298,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");
}
}