diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpm-control.c | 26 | ||||
| -rw-r--r-- | src/gpm-phone.h | 6 |
2 files changed, 16 insertions, 16 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"); } } diff --git a/src/gpm-phone.h b/src/gpm-phone.h index 1d7c3fd..b540539 100644 --- a/src/gpm-phone.h +++ b/src/gpm-phone.h @@ -33,9 +33,9 @@ G_BEGIN_DECLS #define GPM_IS_PHONE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GPM_TYPE_PHONE)) #define GPM_PHONE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GPM_TYPE_PHONE, GpmPhoneClass)) -#define MATE_PHONE_MANAGER_DBUS_SERVICE "org.mate.phone" -#define MATE_PHONE_MANAGER_DBUS_PATH "/org/mate/phone/Manager" -#define MATE_PHONE_MANAGER_DBUS_INTERFACE "org.mate.phone.Manager" +#define MATE_PHONE_MANAGER_DBUS_SERVICE "org.gnome.phone" +#define MATE_PHONE_MANAGER_DBUS_PATH "/org/gnome/phone/Manager" +#define MATE_PHONE_MANAGER_DBUS_INTERFACE "org.gnome.phone.Manager" typedef struct GpmPhonePrivate GpmPhonePrivate; |