1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
--- mate-power-manager-1.5.1/README 2012-11-23 04:26:11.000000000 +0200
+++ mate-power-manager-1.5.1-gkr/README 2013-02-17 00:41:53.504808239 +0200
@@ -15,7 +15,7 @@
- Glib (2.13.0 or later)
- Gtk2+ (2.11.0 or later)
- - MATE Keyring (1.1.0 or later)
+ - GNOME Keyring (0.6.0 or later)
- DBus (0.70 or later)
- libmatenotify (1.1.0 or later)
- Cairo (1.0.0 or later)
--- mate-power-manager-1.5.2/configure.ac~ 2013-03-19 19:02:51.000000000 +0200
+++ mate-power-manager-1.5.2/configure.ac 2013-03-19 19:03:42.805800085 +0200
@@ -103,7 +103,7 @@
GIO_REQUIRED=2.25.0
GTK_REQUIRED=2.17.7
GDK_REQUIRED=2.11.0
-MATE_KEYRING_REQUIRED=1.1.0
+GNOME_KEYRING_REQUIRED=0.6.0
DBUS_REQUIRED=1.0
DBUS_GLIB_REQUIRED=0.70
LIBMATENOTIFY_REQUIRED=1.1.0
@@ -261,7 +261,7 @@
AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
if test "$with_keyring" = "yes"; then
- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED)
+ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
fi
--- mate-power-manager-1.5.1/data/org.mate.power-manager.gschema.xml.in 2012-11-23 04:26:11.000000000 +0200
+++ mate-power-manager-1.5.1-gkr/data/org.mate.power-manager.gschema.xml.in 2013-02-17 00:41:53.504808239 +0200
@@ -183,13 +183,13 @@
</key>
<key name="lock-keyring-suspend" type="b">
<default>false</default>
- <_summary>Lock MATE keyring on sleep</_summary>
- <_description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
+ <_summary>Lock GNOME keyring on sleep</_summary>
+ <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
</key>
<key name="lock-keyring-hibernate" type="b">
<default>true</default>
- <_summary>Lock MATE keyring on sleep</_summary>
- <_description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
+ <_summary>Lock GNOME keyring on sleep</_summary>
+ <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
</key>
<key name="spindown-enable-ac" type="b">
<default>false</default>
--- mate-power-manager-1.6.1/src/gpm-control.c~ 2013-05-06 14:40:50.000000000 +0300
+++ mate-power-manager-1.6.1/src/gpm-control.c 2013-05-06 14:40:52.904974917 +0300
@@ -42,7 +33,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 @@
GpmScreensaver *screensaver;
guint32 throttle_cookie = 0;
#ifdef WITH_KEYRING
- gboolean lock_mate_keyring;
- MateKeyringResult keyres;
+ gboolean lock_keyring;
+ GnomeKeyringResult keyres;
#endif /* WITH_KEYRING */
#ifdef WITH_SYSTEMD_SLEEP
GError *dbus_error = NULL;
@@ -186,10 +186,10 @@
#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_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
+ if (lock_keyring) {
+ keyres = gnome_keyring_lock_all_sync ();
+ if (keyres != GNOME_KEYRING_RESULT_OK)
egg_warning ("could not lock keyring");
}
#endif /* WITH_KEYRING */
@@ -235,8 +226,8 @@
GpmScreensaver *screensaver;
guint32 throttle_cookie = 0;
#ifdef WITH_KEYRING
- gboolean lock_mate_keyring;
- MateKeyringResult keyres;
+ gboolean lock_keyring;
+ GnomeKeyringResult keyres;
#endif /* WITH_KEYRING */
screensaver = gpm_screensaver_new ();
@@ -242,10 +242,10 @@
}
/* 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_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
+ if (lock_keyring) {
+ keyres = gnome_keyring_lock_all_sync ();
+ if (keyres != GNOME_KEYRING_RESULT_OK) {
egg_warning ("could not lock keyring");
}
}
|
