3
3
the user actually activates a connection instead of on modem detect.
6
src/applet-device-gsm.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++--
7
1 file changed, 122 insertions(+), 4 deletions(-)
6
src/applet-device-gsm.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++--
7
1 file changed, 123 insertions(+), 5 deletions(-)
9
9
Index: b/src/applet-device-gsm.c
10
10
===================================================================
11
11
--- a/src/applet-device-gsm.c
12
12
+++ b/src/applet-device-gsm.c
13
@@ -97,8 +97,11 @@ typedef struct {
13
@@ -96,6 +96,8 @@ typedef struct {
14
gboolean skip_reg_poll;
15
gboolean skip_signal_poll;
17
+ gboolean greeter_mode;
14
19
/* Unlock dialog stuff */
18
+ gboolean greeter_mode;
21
GCancellable *cancellable;
22
@@ -103,6 +105,7 @@ typedef struct {
21
+static void unlock_dialog_new (NMDevice *device, GsmDeviceInfo *info);
22
24
static void unlock_dialog_destroy (GsmDeviceInfo *info);
23
25
static void check_start_polling (GsmDeviceInfo *info);
26
+static void unlock_dialog_new (NMDevice *device, GsmDeviceInfo *info);
25
@@ -193,10 +196,117 @@ applet_gsm_connect_network (NMApplet *ap
30
@@ -195,10 +198,117 @@ applet_gsm_connect_network (NMApplet *ap
141
146
applet_menu_item_activate_helper (info->device,
142
147
info->connection,
143
@@ -879,8 +989,10 @@ keyring_pin_check_cb (GnomeKeyringResult
144
info->keyring_id = NULL;
148
@@ -887,9 +997,11 @@ keyring_pin_check_cb (GObject *source,
149
list = secret_service_search_finish (NULL, result, &error);
146
if (result != GNOME_KEYRING_RESULT_OK) {
147
152
- /* No saved PIN, just ask the user */
148
153
- unlock_dialog_new (info->device, info);
154
- g_clear_error (&error);
149
155
+ if (!info->greeter_mode) {
150
156
+ /* No saved PIN, just ask the user */
151
157
+ unlock_dialog_new (info->device, info);
158
+ g_clear_error (&error);
156
@@ -962,8 +1074,10 @@ simid_reply (DBusGProxy *proxy, DBusGPro
163
@@ -967,8 +1079,10 @@ simid_reply (DBusGProxy *proxy, DBusGPro
164
info->cancellable, keyring_pin_check_cb, info);
165
g_hash_table_unref (attrs);
160
167
- /* Couldn't get a device ID, but unlock required; present dialog */
161
168
- unlock_dialog_new (info->device, info);
169
@@ -1207,6 +1321,10 @@ gsm_device_added (NMDevice *device, NMAp
170
info->device = device;
176
@@ -1213,6 +1327,10 @@ gsm_device_added (NMDevice *device, NMAp
178
info->cancellable = g_cancellable_new ();
173
180
+ info->greeter_mode = FALSE;
174
181
+ if (getenv ("INDICATOR_GREETER_MODE"))