Merge lp:~kvalo/indicator-network/bug-687414 into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/agent/passphrase-dialog.c'
--- src/agent/passphrase-dialog.c	2010-11-19 09:58:54 +0000
+++ src/agent/passphrase-dialog.c	2010-12-09 15:16:40 +0000
@@ -170,6 +170,30 @@
   gtk_widget_show_all(GTK_WIDGET(self));
 }
 
+static void parse_passphrase_dict(PassphraseDialog *self, GVariant *dict)
+{
+  PassphraseDialogPrivate *priv = PASSPHRASE_DIALOG_GET_PRIVATE(self);
+  GVariantIter iter;
+  GVariant *value;
+  gchar *key;
+
+  g_variant_iter_init(&iter, dict);
+
+  while (g_variant_iter_next(&iter, "{sv}", &key, &value)) {
+    g_debug("key %s", key);
+
+    if (g_strcmp0(key, "Type") == 0 &&
+	g_variant_type_equal(G_VARIANT_TYPE_STRING,
+			     g_variant_get_type(value))) {
+      /* priv->security_type should be empty now */
+      g_variant_get(value, "s", &priv->security_type);
+    }
+
+    g_variant_unref(value);
+    g_free(key);
+  }
+}
+
 static void method_request_input(PassphraseDialog *self,
 				 GVariant *parameters,
 				 GDBusMethodInvocation *invocation)
@@ -203,11 +227,8 @@
   while (g_variant_iter_next(&dict_iter, "{sv}", &key, &value)) {
     g_debug("key %s", key);
 
-    if (g_strcmp0(key, "Type") == 0 &&
-	g_variant_type_equal(G_VARIANT_TYPE_STRING, g_variant_get_type(value))) {
-      /* priv->security_type should be empty now */
-      g_variant_get(value, "s", &priv->security_type);
-    }
+    if (g_strcmp0(key, "Passphrase") == 0)
+      parse_passphrase_dict(self, value);
 
     g_variant_unref(value);
     g_free(key);
@@ -437,7 +458,9 @@
 
   security = priv->security_type;
   if (security == NULL) {
-    g_warning("%s(): security type not defined", __func__);
+    g_warning("passphrase-dialog: security type not defined");
+    gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_ACCEPT,
+				      TRUE);
     return;
   }
 
@@ -463,6 +486,11 @@
       gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_ACCEPT,
 					FALSE);
     }
+  } else {
+    g_warning("passphrase-dialog: unknown security mode: %s",
+	      priv->security_type);
+    gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_ACCEPT,
+				      TRUE);
   }
 }
 

=== modified file 'tests/connman-mock/connman-mock'
--- tests/connman-mock/connman-mock	2010-11-30 07:33:12 +0000
+++ tests/connman-mock/connman-mock	2010-12-09 15:16:40 +0000
@@ -269,11 +269,10 @@
 
             args = {}
             args["Requirement"] = "Mandatory"
-            args["Type"] = "string"
+            args["Type"] = "wpa"
 
             fields = {}
             fields["Passphrase"] = args
-            fields["Type"] = "wpa"
 
             proxy.RequestInput(service.get_path(), fields,
                                reply_handler=self.request_passphrase_reply,