Merge lp:~kvalo/indicator-network/libconnman-connect-dialog into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

[Mikkel Kamstrup Erlandsen (kamstrup)]

 * connman_manager_connect_service() should add a GCancellable argument to like other GIO async calls use.

 * connman-service.h exports non-namespaced symbols str2*(). Either define them in a .c file or namespace them with connman_service_*()

review: Needs Fixing

[lp:~kvalo/indicator-network/libconnman-connect-dialog]

115. By Kalle Valo on 2010-11-19

connman-manager: added cancellable to connect_service()

116. By Kalle Valo on 2010-11-19

connman-service: add proper namespace prefix to str2* functions

[Kalle Valo (kvalo)]

Mikkel Kamstrup Erlandsen <email address hidden> writes:

> Review: Needs Fixing
>
> * connman_manager_connect_service() should add a
> GCancellable argument to like other GIO async calls use.

Fixed.

> * connman-service.h exports non-namespaced symbols str2*(). Either
> define them in a .c file or namespace them with connman_service_*()

Fixed.

Thank you for the review. I now pushed the fixex to the branch.

--
Kalle Valo

[Mikkel Kamstrup Erlandsen (kamstrup)]

ok, i'm happy now :-)

review: Approve

=== modified file 'src/agent/Makefile.am'
--- src/agent/Makefile.am	2010-11-10 11:18:21 +0000
+++ src/agent/Makefile.am	2010-11-19 12:16:09 +0000
@@ -19,12 +19,12 @@
 
 indicator_network_agent_CFLAGS = \
 	$(GTK_CFLAGS) \
-	$(DBUSGLIB_CFLAGS) \
-	$(GIO_CFLAGS)
+	$(GIO_CFLAGS) \
+	$(CONNMAN_CFLAGS)
 
 indicator_network_agent_LDADD = \
 	$(GTK_LIBS) \
-	$(DBUSGLIB_LIBS) \
 	$(GIO_LIBS) \
 	$(top_builddir)/src/common/libmarshal.la \
-	$(top_builddir)/src/common/liblog.la
+	$(top_builddir)/src/common/liblog.la \
+	$(CONNMAN_LIBS)

=== modified file 'src/agent/connect-error-dialog.c'
--- src/agent/connect-error-dialog.c	2010-09-23 07:24:58 +0000
+++ src/agent/connect-error-dialog.c	2010-11-19 12:16:09 +0000
@@ -27,14 +27,9 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <locale.h>
 
-#include "ofono.h"
-#include "ofono-manager-client.h"
-#include "ofono-simmanager-client.h"
-#include "ofono-modem-client.h"
 #include "marshal.h"
 
 G_DEFINE_TYPE(ConnectErrorDialog, connect_error_dialog, GTK_TYPE_DIALOG);

=== modified file 'src/agent/passphrase-dialog.c'
--- src/agent/passphrase-dialog.c	2010-11-17 13:54:50 +0000
+++ src/agent/passphrase-dialog.c	2010-11-19 12:16:09 +0000
@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <locale.h>
 

=== modified file 'src/agent/pin-dialog.c'
--- src/agent/pin-dialog.c	2010-11-04 10:22:03 +0000
+++ src/agent/pin-dialog.c	2010-11-19 12:16:09 +0000
@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <locale.h>
 

=== modified file 'src/agent/wireless-connect-dialog.c'
--- src/agent/wireless-connect-dialog.c	2010-11-17 13:54:50 +0000
+++ src/agent/wireless-connect-dialog.c	2010-11-19 12:16:09 +0000
@@ -27,13 +27,12 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <locale.h>
+#include <string.h>
 
-#include "connman.h"
-#include "connman-manager-client.h"
-#include "connman-service-client.h"
+#include "connman-manager.h"
+#include "connman-service.h"
 
 G_DEFINE_TYPE(WirelessConnectDialog, wireless_connect_dialog, GTK_TYPE_DIALOG);
 
@@ -41,17 +40,15 @@
 
 struct _WirelessConnectDialogPriv
 {
-  DBusGConnection *system_bus;
-  DBusGProxy *connman_manager;
-  DBusGProxy *service_proxy;
+  ConnmanManager *manager;
+
   GtkWidget *network_combo;
   GtkWidget *count_label;
   GtkWidget *security_combo;
+
   guint service_count;
   GtkListStore *store;
-  DBusGProxyCall *services_call;
-  DBusGProxyCall *connect_call;
-  DBusGProxyCall *connect_service;
+
   gboolean service_selected;
   gboolean connecting;
 };
@@ -62,40 +59,24 @@
 			       WirelessConnectDialogPriv))
 
 enum {
-  COLUMN_PATH,
+  COLUMN_SERVICE,
   COLUMN_NAME,
-  COLUMN_SECURITY,
   N_COLUMNS,
 };
 
 static void wireless_connect_dialog_init(WirelessConnectDialog *self)
 {
   WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  GError *error = NULL;
-
-  priv->system_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-
-  if (error) {
-    g_critical("Unable to connect to the dbus system bus: %s",
-	       error->message);
-    g_error_free(error);
-    return;
-  }
-
-  if (priv->system_bus == NULL) {
-    g_critical("%s(): failed to get system bus", __func__);
-    return;
-  }
-
-  priv->connman_manager = NULL;
-  priv->service_proxy = NULL;
+
+  priv->manager = connman_manager_new();
+
   priv->network_combo = NULL;
+  priv->count_label = NULL;
   priv->security_combo = NULL;
-  priv->count_label = NULL;
+
   priv->service_count = 0;
   priv->store = NULL;
-  priv->services_call = NULL;
-  priv->connect_call = NULL;
+
   priv->service_selected = FALSE;
   priv->connecting = FALSE;
 
@@ -107,30 +88,14 @@
   WirelessConnectDialog *self = WIRELESS_CONNECT_DIALOG(object);
   WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
 
-  if (priv->service_proxy != NULL && priv->connect_call != NULL) {
-    dbus_g_proxy_cancel_call(priv->service_proxy, priv->connect_call);
-    priv->connect_call = NULL;
-  }
-
-  if (priv->connman_manager != NULL && priv->services_call != NULL) {
-    dbus_g_proxy_cancel_call(priv->connman_manager, priv->services_call);
-    priv->services_call = NULL;
-  }
-
-  if (priv->connman_manager != NULL && priv->connect_service != NULL) {
-    dbus_g_proxy_cancel_call(priv->connman_manager, priv->connect_service);
-    priv->connect_service = NULL;
-  }
-
-  if (priv->connman_manager != NULL) {
-    g_object_unref(priv->connman_manager);
-    priv->connman_manager = NULL;
-  }
-
-  if (priv->service_proxy != NULL) {
-    g_object_unref(priv->service_proxy);
-    priv->service_proxy = NULL;
-  }
+  if (priv->manager != NULL) {
+    g_object_unref(priv->manager);
+    priv->manager = NULL;
+  }
+
+  /* all the gtkwidgets are destroyed at the same time as this dialog */
+
+  /* FIXME: what about priv->store? */
 
   G_OBJECT_CLASS(wireless_connect_dialog_parent_class)->dispose(object);
 }
@@ -152,180 +117,47 @@
   g_assert(klass != NULL);
 }
 
-static void connect_service_cb(DBusGProxy *proxy, char *path,
-			       GError *error, gpointer user_data)
-{
-  WirelessConnectDialog *self;
-  WirelessConnectDialogPriv *priv;
-
-  g_debug("%s", __func__);
-
-  g_return_if_fail(user_data != NULL);
-
-  self = WIRELESS_CONNECT_DIALOG(user_data);
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(IS_WIRELESS_CONNECT_DIALOG(self));
-
-  priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-
-  g_return_if_fail(priv != NULL);
-
-  priv->connect_service = NULL;
-  priv->connecting = FALSE;
-
-  if (error) {
-    /* FIXME: show warning to the user that the connection failed */
-    g_warning("ConnectService() failed: %s",error->message);
-    g_error_free(error);
-  }
-
-  g_free(path);
-}
-
-static void connect_service(WirelessConnectDialog *self, const gchar *name,
-			    const gchar *security)
-{
-  WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  GHashTable *properties;
-  DBusGProxyCall *call;
-  GValue *value;
-
-  g_debug("%s %s %s", __func__, name, security);
-
-  g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->system_bus != NULL);
-  g_return_if_fail(priv->connman_manager != NULL);
-
-  if (priv->connecting) {
-    g_debug("%s(): already connecting", __func__);
-    return;
-  }
-
-  if (name == NULL || strlen(name) == 0) {
-    g_warning("%s(): invalid name", __func__);
-    return;
-  }
-
-  if (security == NULL || strlen(security) == 0) {
-    g_warning("%s(): invalid security", __func__);
-    return;
-  }
-
-  properties = g_hash_table_new_full(g_str_hash, g_str_equal,
-				     g_free, g_free);
-
-  value = g_malloc0(sizeof(*value));
-  g_value_init(value, G_TYPE_STRING);
-  g_value_set_string(value, CONNMAN_TECHNOLOGY_WIFI);
-  g_hash_table_insert(properties, g_strdup("Type"), value);
-
-  value = g_malloc0(sizeof(*value));
-  g_value_init(value, G_TYPE_STRING);
-  g_value_set_string(value, "managed");
-  g_hash_table_insert(properties, g_strdup("Mode"), value);
-
-  value = g_malloc0(sizeof(*value));
-  g_value_init(value, G_TYPE_STRING);
-  g_value_set_string(value, name);
-  g_hash_table_insert(properties, g_strdup("SSID"), value);
-
-  value = g_malloc0(sizeof(*value));
-  g_value_init(value, G_TYPE_STRING);
-  g_value_set_string(value, security);
-  g_hash_table_insert(properties, g_strdup("Security"), value);
-
-  /* FIXME: how to ask passphrase? */
-  /* g_hash_table_insert(properties, "Passphrase", value); */
-
-  call = org_moblin_connman_Manager_connect_service_async(priv->connman_manager,
-							  properties,
-							  connect_service_cb,
-							  self);
-  priv->connect_service = call;
-
-  g_hash_table_destroy(properties);
-}
-
-static void connect_cb(DBusGProxy *proxy, GError *error, gpointer user_data)
-{
-  WirelessConnectDialog *self;
-  WirelessConnectDialogPriv *priv;
-
-  self = WIRELESS_CONNECT_DIALOG(user_data);
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(IS_WIRELESS_CONNECT_DIALOG(self));
-
-  priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  g_return_if_fail(priv != NULL);
-
-  priv->connect_call = NULL;
-
-  if (priv->service_proxy != NULL) {
-    g_object_unref(priv->service_proxy);
-    priv->service_proxy = NULL;
-  }
-
-  if (error) {
-    /* FIXME: show warning to the user that the connection failed */
-    g_warning("failed to connect service: %s",error->message);
-    g_error_free(error);
-    return;
-  }
-}
-
-static void connect(WirelessConnectDialog *self, const gchar *path)
-{
-  WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  GError *error = NULL;
-  DBusGProxy *proxy;
-
-  g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->system_bus != NULL);
-
-  if (priv->connecting) {
-    g_debug("%s(): already connecting", __func__);
-    return;
-  }
-
-  if (path == NULL || strlen(path) == 0) {
-    g_warning("%s(): invalid path", __func__);
-    return;
-  }
-
-  proxy = dbus_g_proxy_new_for_name_owner(priv->system_bus,
-					  CONNMAN_SERVICE_NAME,
-					  path,
-					  CONNMAN_SERVICE_INTERFACE,
-					  &error);
-
-  if (error != NULL) {
-    g_warning("failed to create dbus proxy for service %s: %s", path,
-	      error->message);
-    g_error_free(error);
-    return;
-  }
-
-  if (proxy == NULL) {
-    g_warning("failed to create dbus proxy for service %s", path);
-    return;
-  }
-
-  priv->service_proxy = proxy;
-  priv->connecting = TRUE;
-
-  priv->connect_call = org_moblin_connman_Service_connect_async(proxy,
-								connect_cb,
-								self);
+static void connect_service_cb(GObject *object, GAsyncResult *res,
+			       gpointer user_data)
+{
+  ConnmanManager *manager = CONNMAN_MANAGER(object);
+  GError *error = NULL;
+
+  connman_manager_connect_service_finish(manager, res, &error);
+
+  if (error != NULL) {
+    g_print("connect service failed: %s\n", error->message);
+    g_error_free(error);
+    return;
+  }
+}
+
+static void connect_cb(GObject *object, GAsyncResult *res,
+		       gpointer user_data)
+{
+  ConnmanService *service = CONNMAN_SERVICE(object);
+  GError *error = NULL;
+
+  connman_service_connect_finish(service, res, &error);
+
+  if (error != NULL) {
+    g_print("connect failed: %s\n", error->message);
+    g_error_free(error);
+    return;
+  }
 }
 
 static void responded(GtkDialog *dialog, gint response_id, gpointer user_data)
 {
   WirelessConnectDialog *self = WIRELESS_CONNECT_DIALOG(user_data);
   WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
+  ConnmanServiceSecurity security;
+  ConnmanService *service;
+  gchar *name;
   GtkTreeIter iter;
   gboolean result;
-  gchar *path, *name, *security;
+
+  g_return_if_fail(priv != NULL);
 
   gtk_widget_hide_all(GTK_WIDGET(self));
 
@@ -334,8 +166,6 @@
 
   /* connect to the service */
 
-  g_debug("%s(): %d", __func__, priv->service_selected);
-
   if (priv->service_selected) {
     result = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->network_combo),
 					   &iter);
@@ -343,51 +173,37 @@
       return;
 
     gtk_tree_model_get(GTK_TREE_MODEL(priv->store), &iter,
-		       COLUMN_PATH, &path, -1);
-    connect(self, path);
-
-    g_free(path);
-    path = NULL;
+		       COLUMN_SERVICE, &service, -1);
+
+    g_return_if_fail(CONNMAN_IS_SERVICE(service));
+
+    connman_service_connect(service, connect_cb, dialog);
   } else {
     name = gtk_combo_box_get_active_text(GTK_COMBO_BOX(priv->network_combo));
-    security = gtk_combo_box_get_active_text(GTK_COMBO_BOX(priv->security_combo));
-    connect_service(self, name, security);
+    security = gtk_combo_box_get_active(GTK_COMBO_BOX(priv->security_combo));
+    connman_manager_connect_service(priv->manager,
+				    CONNMAN_SERVICE_TYPE_WIFI,
+				    CONNMAN_SERVICE_MODE_MANAGED,
+				    security,
+				    (guint8 *) name,
+				    strlen(name),
+				    NULL,
+				    connect_service_cb,
+				    self);
 
     g_free(name);
-    g_free(security);
     name = NULL;
-    security = NULL;
   }
 }
 
-static int get_security_index(WirelessConnectDialog *self,
-			       const gchar *security)
-{
-  if (g_strcmp0(security, CONNMAN_SECURITY_NONE) == 0)
-    return 0;
-  else if (g_strcmp0(security, CONNMAN_SECURITY_WEP) == 0)
-    return 1;
-  else if (g_strcmp0(security, CONNMAN_SECURITY_PSK) == 0)
-    return 2;
-  else if (g_strcmp0(security, CONNMAN_SECURITY_WPA) == 0)
-    return 2;
-  else if (g_strcmp0(security, CONNMAN_SECURITY_RSN) == 0)
-    return 2;
-
-  g_debug("unsupported security type: %s", security);
-  return -1;
-}
-
-
 static void network_changed(GtkComboBox *combo, gpointer user_data)
 {
   WirelessConnectDialog *self = WIRELESS_CONNECT_DIALOG(user_data);
   WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
+  ConnmanServiceSecurity security;
+  ConnmanService *service;
   GtkTreeIter iter;
   gboolean result;
-  gchar *security;
-
-  g_debug("%s()", __func__);
 
   result = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->network_combo),
 					 &iter);
@@ -397,23 +213,21 @@
     return;
 
   gtk_tree_model_get(GTK_TREE_MODEL(priv->store), &iter,
-		     COLUMN_SECURITY, &security, -1);
-
-  gtk_combo_box_set_active(GTK_COMBO_BOX(priv->security_combo),
-			   get_security_index(self, security));
-
-  g_free(security);
+		     COLUMN_SERVICE, &service, -1);
+
+  security = connman_service_get_security(service);
+
+  gtk_combo_box_set_active(GTK_COMBO_BOX(priv->security_combo), security);
 }
 
 static void security_changed(GtkComboBox *combo, gpointer user_data)
 {
   WirelessConnectDialog *self = WIRELESS_CONNECT_DIALOG(user_data);
   WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
+  ConnmanServiceSecurity active, security;
+  ConnmanService *service;
   GtkTreeIter iter;
   gboolean result;
-  gchar *security;
-
-  g_debug("%s()", __func__);
 
   result = gtk_combo_box_get_active_iter(GTK_COMBO_BOX(priv->network_combo),
 					 &iter);
@@ -423,15 +237,17 @@
   }
 
   gtk_tree_model_get(GTK_TREE_MODEL(priv->store), &iter,
-		     COLUMN_SECURITY, &security, -1);
-
-  if (gtk_combo_box_get_active(GTK_COMBO_BOX(priv->security_combo)) !=
-      get_security_index(self, security))
+		     COLUMN_SERVICE, &service, -1);
+
+  g_return_if_fail(CONNMAN_IS_SERVICE(service));
+
+  active = gtk_combo_box_get_active(GTK_COMBO_BOX(priv->security_combo));
+  security = connman_service_get_security(service);
+
+  if (active != security)
     priv->service_selected = FALSE;
   else
     priv->service_selected = TRUE;
-
-  g_free(security);
 }
 
 static void update_count_label(WirelessConnectDialog *self)
@@ -439,160 +255,31 @@
   WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
   gchar buf[200];
 
+  /* FIXME: use g_strdup_printf()? */
   g_snprintf(buf, sizeof(buf), _("%d networks detected"), priv->service_count);
+
   gtk_label_set_text(GTK_LABEL(priv->count_label), buf);
 }
 
-static void iterate_array(gpointer data, gpointer user_data)
-{
-  WirelessConnectDialog *self = WIRELESS_CONNECT_DIALOG(user_data);
-  WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  GValueArray *val_array = data;
-  GHashTable *properties;
-  const gchar *path, *name, *type, *security;
-  GtkTreeIter iter;
-  GValue *value;
-
-  g_return_if_fail(val_array != NULL);
-
-  if (val_array->n_values != 2)
-    return;
-
-  /* object path */
-  value = g_value_array_get_nth(val_array, 0);
-  g_return_if_fail(G_IS_VALUE(value));
-  g_return_if_fail(G_VALUE_TYPE(value) == DBUS_TYPE_G_OBJECT_PATH);
-  g_return_if_fail(G_VALUE_HOLDS_BOXED(value));
-
-  path = g_value_get_boxed(value);
-  if (!path)
-    return;
-
-  /* properties */
-  value = g_value_array_get_nth(val_array, 1);
-  g_return_if_fail(G_IS_VALUE(value));
-  g_return_if_fail(G_VALUE_HOLDS_BOXED(value));
-
-  properties = g_value_get_boxed(value);
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_TYPE);
-  if (value == NULL)
-    return;
-
-  type = g_value_get_string(value);
-
-  /* add only wifi services, drop others */
-  if (g_strcmp0(type, CONNMAN_TECHNOLOGY_WIFI) != 0)
-    return;
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_NAME);
-  if (value == NULL)
-    return;
-
-  name = g_value_get_string(value);
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_SECURITY);
-  if (value == NULL)
-    return;
-
-  security = g_value_get_string(value);
-
-  gtk_list_store_append(priv->store, &iter);
-  gtk_list_store_set(priv->store, &iter, COLUMN_PATH, path,
-		     COLUMN_NAME, name, COLUMN_SECURITY, security, -1);
-
-  priv->service_count++;
-}
-
-static void get_services_cb(DBusGProxy *proxy, GPtrArray *array, GError *error,
-		     gpointer user_data)
-{
-  WirelessConnectDialog *self;
-  WirelessConnectDialogPriv *priv;
-
-  g_return_if_fail(user_data != NULL);
-  self =  WIRELESS_CONNECT_DIALOG(user_data);
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(IS_WIRELESS_CONNECT_DIALOG(self));
-
-  priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  g_return_if_fail(priv != NULL);
-
-  priv->services_call = NULL;
-
-  if (error) {
-    g_warning("%s(): failed to get properties from ofono manager: %s",
-	      __func__, error->message);
-    g_error_free(error);
-    return;
-  }
-
-  gtk_list_store_clear(priv->store);
-  priv->service_count = 0;
-
-  g_ptr_array_foreach(array, iterate_array, self);
-  g_ptr_array_free(array, TRUE);
-
-  update_count_label(self);
-}
-
-static gboolean get_connman_manager(WirelessConnectDialog *self)
-{
-  WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-
-  if (priv->connman_manager != NULL)
-    return TRUE;
-
-  /* FIXME: handle connman missing or crashing */
-  priv->connman_manager = dbus_g_proxy_new_for_name(priv->system_bus,
-						    CONNMAN_SERVICE_NAME,
-						    CONNMAN_MANAGER_PATH,
-						    CONNMAN_MANAGER_INTERFACE);
-  if (priv->connman_manager == NULL)
-    return FALSE;
-
-  return TRUE;
-}
-
-static void get_services(WirelessConnectDialog *self)
-{
-  WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-  DBusGProxyCall *call;
-
-  if (priv->connman_manager == NULL)
-    if (get_connman_manager(self) == FALSE)
-      return;
-
-  if (priv->services_call != NULL)
-    /* call already in progress */
-    return;
-
-  call = org_moblin_connman_Manager_get_services_async(priv->connman_manager,
-						       get_services_cb,
-						       self);
-
-  priv->services_call = call;
-}
-
 void wireless_connect_dialog_show(WirelessConnectDialog *self)
 {
-  WirelessConnectDialogPriv *priv;
+  WirelessConnectDialogPriv *priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
+  ConnmanService **services, *service;
+  GtkTreeIter iter;
   GtkWidget *entry;
 
-  g_return_if_fail(self != NULL);
   g_return_if_fail(IS_WIRELESS_CONNECT_DIALOG(self));
-
-  priv = WIRELESS_CONNECT_DIALOG_GET_PRIVATE(self);
-
-  if (gtk_widget_get_visible(GTK_WIDGET(self)))
-    return;
-
-  /*
-   * Delibretely updating services only when dialog is set to the visible
-   * until we have solved service update usability issues.
-   */
-  get_services(self);
+  g_return_if_fail(priv != NULL);
+
+  if (gtk_widget_get_visible(GTK_WIDGET(self))) {
+    g_warning("Already showing wireless connect dialog, canceling request");
+    return;
+  }
+
+  if (!connman_manager_is_connected(priv->manager)) {
+    g_warning("Not connected to connman, not showing wireless connect dialog");
+    return;
+  }
 
   priv->service_selected = FALSE;
 
@@ -607,6 +294,30 @@
 
   gtk_entry_set_text(GTK_ENTRY(entry), "");
 
+  gtk_list_store_clear(priv->store);
+
+
+  services = connman_manager_get_services(priv->manager);
+  priv->service_count = 0;
+
+  if (services == NULL)
+    goto out;
+
+  for (;*services != NULL; services++) {
+    service = *services;
+    g_object_ref(service);
+
+    gtk_list_store_append(priv->store, &iter);
+    gtk_list_store_set(priv->store, &iter,
+		       COLUMN_SERVICE, service,
+		       COLUMN_NAME, connman_service_get_name(service),
+		       -1);
+    priv->service_count++;
+  }
+
+ out:
+  update_count_label(self);
+
   gtk_widget_show_all(GTK_WIDGET(self));
 }
 
@@ -639,7 +350,7 @@
   gtk_size_group_add_widget(group, label);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
 
-  priv->store = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
+  priv->store = gtk_list_store_new(N_COLUMNS, CONNMAN_TYPE_SERVICE,
 				   G_TYPE_STRING);
   priv->network_combo = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(priv->store),
 							   COLUMN_NAME);
@@ -666,13 +377,17 @@
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
 
   priv->security_combo = gtk_combo_box_new_text();
-  gtk_combo_box_append_text(GTK_COMBO_BOX(priv->security_combo),
-			    CONNMAN_SECURITY_NONE);
-  gtk_combo_box_append_text(GTK_COMBO_BOX(priv->security_combo),
-			    CONNMAN_SECURITY_WEP);
-  gtk_combo_box_append_text(GTK_COMBO_BOX(priv->security_combo),
-			    CONNMAN_SECURITY_PSK);
-  gtk_combo_box_set_active(GTK_COMBO_BOX(priv->security_combo), 0);
+  gtk_combo_box_insert_text(GTK_COMBO_BOX(priv->security_combo),
+			    CONNMAN_SERVICE_SECURITY_NONE,
+			    _("None"));
+  gtk_combo_box_insert_text(GTK_COMBO_BOX(priv->security_combo),
+			    CONNMAN_SERVICE_SECURITY_WEP,
+			    _("WEP"));
+  gtk_combo_box_insert_text(GTK_COMBO_BOX(priv->security_combo),
+			    CONNMAN_SERVICE_SECURITY_PSK,
+			    _("WPA-PSK"));
+  gtk_combo_box_set_active(GTK_COMBO_BOX(priv->security_combo),
+			   CONNMAN_SERVICE_SECURITY_NONE);
   g_signal_connect(G_OBJECT(priv->security_combo), "changed",
 		   G_CALLBACK(security_changed), self);
   gtk_box_pack_start(GTK_BOX(hbox), priv->security_combo, TRUE, TRUE, 5);

=== modified file 'src/common/connman-manager.c'
--- src/common/connman-manager.c	2010-11-18 08:24:56 +0000
+++ src/common/connman-manager.c	2010-11-19 12:16:09 +0000
@@ -20,6 +20,8 @@
 
 #include "connman-manager.h"
 
+#include <string.h>
+
 #include "connman-manager-xml.h"
 #include "connman.h"
 #include "marshal.h"
@@ -46,6 +48,9 @@
   gboolean initialised;
 
   guint watch_id;
+
+  /* used only by get_services() */
+  ConnmanService **array;
 };
 
 enum {
@@ -64,6 +69,98 @@
   PROP_CONNECTED,
 };
 
+static void connect_service_cb(GObject *object, GAsyncResult *res,
+			       gpointer user_data)
+{
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(user_data);
+  GDBusProxy *proxy = G_DBUS_PROXY(object);
+  GError *error = NULL;
+
+  g_dbus_proxy_call_finish(proxy, res, &error);
+
+  if (error != NULL) {
+    g_simple_async_result_set_from_error(simple, error);
+    g_error_free(error);
+    goto out;
+  }
+
+ out:
+  g_simple_async_result_complete(simple);
+  g_object_unref(simple);
+}
+
+void connman_manager_connect_service(ConnmanManager *self,
+				     ConnmanServiceType type,
+				     ConnmanServiceMode mode,
+				     ConnmanServiceSecurity security,
+				     guint8 *ssid,
+				     guint ssid_len,
+				     GCancellable *cancellable,
+				     GAsyncReadyCallback callback,
+				     gpointer user_data)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+  gchar ssid_buf[ssid_len + 1];
+  GSimpleAsyncResult *simple;
+  GVariantBuilder *builder;
+  GVariant *parameters;
+
+  g_return_if_fail(CONNMAN_IS_MANAGER(self));
+  g_return_if_fail(priv != NULL);
+
+  simple = g_simple_async_result_new(G_OBJECT(self), callback,
+                                      user_data,
+				     connman_manager_connect_service);
+
+  /*
+   * FIXME: ssid can contain any character possible, including null, but
+   * for now null terminate the buffer with null and send it as a string to
+   * connman. But this needs to be properly fixed at some point.
+   */
+  memcpy(ssid_buf, ssid, ssid_len);
+  ssid_buf[ssid_len] = '\0';
+
+  builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+  g_variant_builder_add(builder, "{sv}", "Type",
+			g_variant_new_string(connman_service_type2str(type)));
+  g_variant_builder_add(builder, "{sv}", "Mode",
+			g_variant_new_string(connman_service_mode2str(mode)));
+  g_variant_builder_add(builder, "{sv}", "Security",
+			g_variant_new_string(connman_service_security2str(security)));
+  g_variant_builder_add(builder, "{sv}", "SSID",
+			g_variant_new_string(ssid_buf));
+
+  parameters = g_variant_new("(a{sv})", builder);
+
+  /* FIXME: cancel the call on dispose */
+  g_dbus_proxy_call(priv->proxy, "ConnectService", parameters,
+  		    G_DBUS_CALL_FLAGS_NONE, CONNECT_TIMEOUT, cancellable,
+  		    connect_service_cb, simple);
+}
+
+void connman_manager_connect_service_finish(ConnmanManager *self,
+					    GAsyncResult *res,
+					    GError **error)
+{
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(res);
+
+  g_return_if_fail(CONNMAN_IS_MANAGER(self));
+  g_return_if_fail(g_simple_async_result_get_source_tag(simple) ==
+		   connman_manager_connect_service);
+
+  g_simple_async_result_propagate_error(simple, error);
+}
+
+gboolean connman_manager_is_connected(ConnmanManager *self)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_MANAGER(self), FALSE);
+  g_return_val_if_fail(priv != NULL, FALSE);
+
+  return priv->connected;
+}
+
 static void iterate_create_list(gpointer key, gpointer value,
 				gpointer user_data)
 {
@@ -80,7 +177,7 @@
 ConnmanService **connman_manager_get_services(ConnmanManager *self)
 {
   ConnmanManagerPrivate *priv = GET_PRIVATE(self);
-  ConnmanService *service, **array;
+  ConnmanService *service;
   GList *l;
   gint i;
 
@@ -97,10 +194,12 @@
 
   g_hash_table_foreach(priv->services, iterate_create_list, &l);
 
+  g_free(priv->array);
+
   /* allocate space for the pointers and the null termination */
-  array = g_malloc((sizeof(ConnmanService *) * g_list_length(l)) + 1);
+  priv->array = g_malloc((sizeof(ConnmanService *) * g_list_length(l)) + 1);
 
-  if (array == NULL)
+  if (priv->array == NULL)
     return NULL;
 
   for (i = 0; l != NULL; l = l->next) {
@@ -113,15 +212,35 @@
     if (!connman_service_is_ready(service))
       continue;
 
-    array[i++] = service;
+    priv->array[i++] = service;
   }
 
-  array[i] = NULL;
+  priv->array[i] = NULL;
 
   g_list_free(l);
   l = NULL;
 
-  return array;
+  return priv->array;
+}
+
+static void iterate_service_ready(gpointer key, gpointer value,
+				  gpointer user_data)
+{
+  gboolean *not_ready = user_data;
+  ConnmanService *service = value;
+
+  if (!connman_service_is_ready(service))
+    *not_ready = TRUE;
+}
+
+static gboolean all_services_ready(ConnmanManager *self)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+  gboolean not_ready = FALSE;
+
+  g_hash_table_foreach(priv->services, iterate_service_ready, &not_ready);
+
+  return !not_ready;
 }
 
 static void service_ready(ConnmanService *service, GParamSpec *pspec,
@@ -135,11 +254,17 @@
 
   /*
    * Send service added signals only after we are connected. The client
-   * needs to get all the services when it has received the connected
+   * needs to call get_services() when it has received the connected
    * signal.
    */
-  if (!priv->connected)
+  if (!priv->connected) {
+    if (all_services_ready(self)) {
+      priv->connected = TRUE;
+      g_object_notify(G_OBJECT(self), "connected");
+    }
+
     return;
+  }
 
   g_signal_emit(self, signals[SERVICE_ADDED_SIGNAL], 0, service);
 }
@@ -297,7 +422,8 @@
   if (!priv->initialised)
     priv->initialised = TRUE;
 
-  if (!priv->connected) {
+  if (!priv->connected && g_hash_table_size(priv->services) == 0) {
+    /* no services so we can change to connected immediately */
     priv->connected = TRUE;
     g_object_notify(G_OBJECT(self), "connected");
   }
@@ -458,6 +584,12 @@
 
 static void connman_manager_finalize(GObject *object)
 {
+  ConnmanManager *self = CONNMAN_MANAGER(object);
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_free(priv->array);
+  priv->array = NULL;
+
   G_OBJECT_CLASS(connman_manager_parent_class)->finalize(object);
 }
 

=== modified file 'src/common/connman-manager.h'
--- src/common/connman-manager.h	2010-11-17 14:42:58 +0000
+++ src/common/connman-manager.h	2010-11-19 12:16:09 +0000
@@ -55,6 +55,19 @@
 
 GType connman_manager_get_type(void);
 
+void connman_manager_connect_service(ConnmanManager *self,
+				     ConnmanServiceType type,
+				     ConnmanServiceMode mode,
+				     ConnmanServiceSecurity security,
+				     guint8 *ssid,
+				     guint ssid_len,
+				     GCancellable *cancellable,
+				     GAsyncReadyCallback callback,
+				     gpointer user_data);
+void connman_manager_connect_service_finish(ConnmanManager *self,
+					    GAsyncResult *res,
+					    GError **error);
+gboolean connman_manager_is_connected(ConnmanManager *self);
 ConnmanService **connman_manager_get_services(ConnmanManager *self);
 ConnmanManager *connman_manager_new(void);
 

=== modified file 'src/common/connman-service.c'
--- src/common/connman-service.c	2010-11-18 10:53:50 +0000
+++ src/common/connman-service.c	2010-11-19 12:16:09 +0000
@@ -68,7 +68,6 @@
 };
 
 #define SERVICE_NAME_UNKNOWN _("<unnamed>")
-#define CONNECT_TIMEOUT 120000
 #define DISCONNECT_TIMEOUT 10000
 
 struct service_state_string
@@ -116,6 +115,17 @@
   { "cellular",		CONNMAN_SERVICE_TYPE_CELLULAR },
 };
 
+struct service_mode_string
+{
+  const gchar *str;
+  ConnmanServiceMode mode;
+};
+
+static const struct service_mode_string service_mode_map[] = {
+  { "managed",		CONNMAN_SERVICE_MODE_MANAGED },
+  { "adhoc",		CONNMAN_SERVICE_MODE_ADHOC },
+};
+
 static void connect_cb(GObject *object, GAsyncResult *res,
 		       gpointer user_data)
 {
@@ -289,7 +299,7 @@
   return priv->ready;
 }
 
-static ConnmanServiceState str2state(const gchar *state)
+ConnmanServiceState connman_service_str2state(const gchar *state)
 {
   const struct service_state_string *s;
   guint i;
@@ -305,7 +315,23 @@
   return CONNMAN_SERVICE_STATE_IDLE;
 }
 
-static ConnmanServiceType str2type(const gchar *type)
+const gchar *connman_service_state2str(ConnmanServiceState state)
+{
+  const struct service_state_string *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(service_state_map); i++) {
+    s = &service_state_map[i];
+    if (s->state == state)
+      return s->str;
+  }
+
+  g_warning("%s(): unknown state %d", __func__, state);
+
+  return "unknown";
+}
+
+ConnmanServiceType connman_service_str2type(const gchar *type)
 {
   const struct service_type_string *s;
   guint i;
@@ -321,7 +347,23 @@
   return CONNMAN_SERVICE_TYPE_ETHERNET;
 }
 
-static ConnmanServiceSecurity str2security(const gchar *security)
+const gchar *connman_service_type2str(ConnmanServiceType type)
+{
+  const struct service_type_string *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(service_type_map); i++) {
+    s = &service_type_map[i];
+    if (s->type == type)
+      return s->str;
+  }
+
+  g_warning("%s(): unknown type %d", __func__, type);
+
+  return "unknown";
+}
+
+ConnmanServiceSecurity connman_service_str2security(const gchar *security)
 {
   const struct service_security_string *s;
   guint i;
@@ -337,13 +379,61 @@
   return CONNMAN_SERVICE_SECURITY_NONE;
 }
 
+const gchar *connman_service_security2str(ConnmanServiceSecurity security)
+{
+  const struct service_security_string *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(service_security_map); i++) {
+    s = &service_security_map[i];
+    if (s->security == security)
+      return s->str;
+  }
+
+  g_warning("%s(): unknown security %d", __func__, security);
+
+  return "unknown";
+}
+
+ConnmanServiceMode connman_service_str2mode(const gchar *mode)
+{
+  const struct service_mode_string *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(service_mode_map); i++) {
+    s = &service_mode_map[i];
+    if (g_strcmp0(s->str, mode) == 0)
+      return s->mode;
+  }
+
+  g_warning("unknown service mode %s", mode);
+
+  return CONNMAN_SERVICE_MODE_MANAGED;
+}
+
+const gchar *connman_service_mode2str(ConnmanServiceMode mode)
+{
+  const struct service_mode_string *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(service_mode_map); i++) {
+    s = &service_mode_map[i];
+    if (s->mode == mode)
+      return s->str;
+  }
+
+  g_warning("%s(): unknown mode %d", __func__, mode);
+
+  return "unknown";
+}
+
 static void update_state(ConnmanService *self, GVariant *variant)
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
   const gchar *s;
 
   s = g_variant_get_string(variant, NULL);
-  priv->state = str2state(s);
+  priv->state = connman_service_str2state(s);
 
   g_object_notify(G_OBJECT(self), "state");
 
@@ -380,7 +470,7 @@
   const gchar *s;
 
   s = g_variant_get_string(variant, NULL);
-  priv->type = str2type(s);
+  priv->type = connman_service_str2type(s);
 
   g_object_notify(G_OBJECT(self), "type");
 
@@ -393,7 +483,7 @@
   const gchar *s;
 
   s = g_variant_get_string(variant, NULL);
-  priv->security = str2security(s);
+  priv->security = connman_service_str2security(s);
 
   g_object_notify(G_OBJECT(self), "security");
 

=== modified file 'src/common/connman-service.h'
--- src/common/connman-service.h	2010-11-18 10:53:50 +0000
+++ src/common/connman-service.h	2010-11-19 12:16:09 +0000
@@ -79,6 +79,13 @@
   CONNMAN_SERVICE_TYPE_CELLULAR,
 } ConnmanServiceType;
 
+typedef enum {
+  CONNMAN_SERVICE_MODE_MANAGED,
+  CONNMAN_SERVICE_MODE_ADHOC,
+} ConnmanServiceMode;
+
+#define CONNECT_TIMEOUT 120000
+
 GType connman_service_get_type(void);
 
 ConnmanServiceState connman_service_get_state(ConnmanService *self);
@@ -107,4 +114,14 @@
 gboolean connman_service_is_ready(ConnmanService *self);
 ConnmanService *connman_service_new(const gchar *path);
 
+/* helper functions */
+ConnmanServiceState connman_service_str2state(const gchar *state);
+const gchar *connman_service_state2str(ConnmanServiceState state);
+ConnmanServiceType connman_service_str2type(const gchar *type);
+const gchar *connman_service_type2str(ConnmanServiceType type);
+ConnmanServiceSecurity connman_service_str2security(const gchar *security);
+const gchar *connman_service_security2str(ConnmanServiceSecurity security);
+ConnmanServiceMode connman_service_str2mode(const gchar *mode);
+const gchar *connman_service_mode2str(ConnmanServiceMode mode);
+
 #endif

=== modified file 'tests/libconnman-tool.c'
--- tests/libconnman-tool.c	2010-11-18 10:55:19 +0000
+++ tests/libconnman-tool.c	2010-11-19 12:16:09 +0000
@@ -19,16 +19,40 @@
  */
 
 #include <glib.h>
+#include <string.h>
 
 #include "connman-manager.h"
 #include "connman-service.h"
 
+#define HIDDEN_SSID "hiddenssid"
+
 static GMainLoop *loop;
 static ConnmanManager *connman;
 
+static enum {
+  TEST_LIST_SERVICES,
+  TEST_CONNECT_SERVICE,
+} test;
+
 static void usage(const gchar *name)
 {
-  g_print("%s: list-services\n", name);
+  g_print("%s: list-services|connect-service\n", name);
+}
+
+static void connect_hidden_ssid_cb(GObject *object, GAsyncResult *res,
+				   gpointer user_data)
+{
+  GError *error = NULL;
+
+  connman_manager_connect_service_finish(connman, res, &error);
+
+  if (error != NULL) {
+    g_print("connect hidden ssid failed: %s\n", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  g_print("hidden ssid connected\n");
 }
 
 static void disconnect_cb(GObject *object, GAsyncResult *res,
@@ -151,6 +175,7 @@
 {
   ConnmanService **services;
   gboolean connected;
+  guint count;
 
   g_object_get(proxy, "connected", &connected, NULL);
 
@@ -159,6 +184,18 @@
   if (!connected)
     return;
 
+ if (test == TEST_CONNECT_SERVICE) {
+    connman_manager_connect_service(connman, CONNMAN_SERVICE_TYPE_WIFI,
+				    CONNMAN_SERVICE_MODE_MANAGED,
+				    CONNMAN_SERVICE_SECURITY_NONE,
+				    (guint8 *) HIDDEN_SSID,
+				    strlen(HIDDEN_SSID),
+				    NULL,
+				    connect_hidden_ssid_cb,
+				    NULL);
+    return;
+  }
+
   services = connman_manager_get_services(connman);
 
   if (services == NULL) {
@@ -166,10 +203,15 @@
     return;
   }
 
+  count = 0;
+
   while (*services != NULL) {
     new_service(*services);
     services++;
+    count++;
   }
+
+  g_print("%d services received\n", count);
 }
 
 static void service_added(ConnmanManager *proxy, ConnmanService *service,
@@ -200,12 +242,21 @@
   loop = g_main_loop_new(NULL, FALSE);
 
   connman = connman_manager_new();
+
+  if (g_strcmp0(argv[1], "list-services") == 0)
+    test = TEST_LIST_SERVICES;
+  else if (g_strcmp0(argv[1], "connect-service") == 0)
+    test = TEST_CONNECT_SERVICE;
+
   g_signal_connect(connman, "notify::connected", G_CALLBACK(connected_cb),
 		   NULL);
-  g_signal_connect(connman, "service-added", G_CALLBACK(service_added),
-		   NULL);
-  g_signal_connect(connman, "service-removed", G_CALLBACK(service_removed),
-		   NULL);
+
+  if (test == TEST_LIST_SERVICES) {
+    g_signal_connect(connman, "service-added", G_CALLBACK(service_added),
+		     NULL);
+    g_signal_connect(connman, "service-removed", G_CALLBACK(service_removed),
+		     NULL);
+  }
 
   g_main_loop_run(loop);