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

[Kalle Valo]

Port most of backend (indicator-network-service) to libconnman. manager-proxy and ofono-manager are not ported yet.

This is a big merge, but I didn't find an easy way to make this smaller. Sorry about that.

[Mikkel Kamstrup Erlandsen (kamstrup)]

review needsfixing

General request: The code tree is nicely structured into modules, but
it's not immediately obvious how these things relate and what their
roles are. Could you add a short document describing this? Maybe also
add two lines in the different class headers to describe their role
and responsibilities briefly.

ui-proxy.c
+ /* FIXME: cancel the call on dispose */
+ g_dbus_proxy_call(priv->proxy, "Start", NULL,
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+ call_cb, self);

It's often easier to just g_object_ref(self) and then
g_object_unref(self) in call_cb(). You can apply that pattern in a few
places, but just mentioning this one place to cut down on the review
size :-)

ui-proxy.c
+ parameters = g_variant_new("(i)", level);
+
+ /* FIXME: cancel the call on dispose */
+ g_dbus_proxy_call(priv->proxy, "SetDebug", parameters,
+ G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+ call_cb, self);

In my eyes it improves code readability if you inline g_variant_new()
in the method call, which works so elegantly with the floating refs.
It also cuts significantly down on the LOC. This is purely a personal
style issue so feel free to disregard :-)

ui-proxy.c
+ variant = g_simple_async_result_get_op_res_gpointer(simple);
+ g_variant_get(variant, "s", pin);
+
+ /* I assume simple still owns variant and unrefs it */

Yes it does. By your construction in ask_pin_cb(). Maybe change the
comment to reflect that.

ui-proxy.c
+static void ui_proxy_dispose(GObject *object)
+{
+ UIProxy *self = UI_PROXY(object);
+ UIProxyPrivate *priv = GET_PRIVATE(self);
+
+ if (priv->watch_id != 0) {
+ g_bus_unwatch_name(priv->watch_id);
+ priv->watch_id = 0;
+ }

You leak priv->proxy here if it's set.

ofono-manager.c
+ UIProxy *ui = UI_PROXY(object);
+ GError *error = NULL;
+
+ g_return_if_fail(priv != NULL);
+
+ ui_proxy_ask_pin_finish(ui, res, &error);

Don't you want to assign the return value to a gchar*? If you want to
ignore it you are still leaking it right now.

[lp:~kvalo/indicator-network/libconnman-backend]

147. By Kalle Valo on 2010-11-26

ui-proxy: take a ref on self when doing async calls

148. By Kalle Valo on 2010-11-26

ui-proxy: clear up data ownership in ask_pin_finish()

149. By Kalle Valo on 2010-11-26

ui-proxy: fix priv->proxy leak

150. By Kalle Valo on 2010-11-26

Write a bit about code structure to README.

[Kalle Valo (kvalo)]

Mikkel Kamstrup Erlandsen <email address hidden> writes:

> General request: The code tree is nicely structured into modules, but
> it's not immediately obvious how these things relate and what their
> roles are. Could you add a short document describing this?

I now added small description to README, but this needs to be improved a
lot.

> Maybe also add two lines in the different class headers to describe
> their role and responsibilities briefly.

What's the best location to do this? Top of the object struct?

/* write documentation here? */
typedef struct {
  GObject parent;
} UIProxy;

> ui-proxy.c
> + /* FIXME: cancel the call on dispose */
> + g_dbus_proxy_call(priv->proxy, "Start", NULL,
> + G_DBUS_CALL_FLAGS_NONE, -1, NULL,
> + call_cb, self);
>
> It's often easier to just g_object_ref(self) and then
> g_object_unref(self) in call_cb(). You can apply that pattern in a few
> places, but just mentioning this one place to cut down on the review
> size :-)

Oh, this is a really nice trick. I changed UIProxy now to use this and
start using elsewhere from now on.

> ui-proxy.c
> + parameters = g_variant_new("(i)", level);
> +
> + /* FIXME: cancel the call on dispose */
> + g_dbus_proxy_call(priv->proxy, "SetDebug", parameters,
> + G_DBUS_CALL_FLAGS_NONE, -1, NULL,
> + call_cb, self);
>
> In my eyes it improves code readability if you inline g_variant_new()
> in the method call, which works so elegantly with the floating refs.
> It also cuts significantly down on the LOC. This is purely a personal
> style issue so feel free to disregard :-)

Thanks, I will definitely consider this. I usually try to avoid doing
too much on one line and that's why I sometimes use so many lines.

> ui-proxy.c
> + variant = g_simple_async_result_get_op_res_gpointer(simple);
> + g_variant_get(variant, "s", pin);
> +
> + /* I assume simple still owns variant and unrefs it */
>
> Yes it does. By your construction in ask_pin_cb(). Maybe change the
> comment to reflect that.

Improved.

> ui-proxy.c
> +static void ui_proxy_dispose(GObject *object)
> +{
> + UIProxy *self = UI_PROXY(object);
> + UIProxyPrivate *priv = GET_PRIVATE(self);
> +
> + if (priv->watch_id != 0) {
> + g_bus_unwatch_name(priv->watch_id);
> + priv->watch_id = 0;
> + }
>
> You leak priv->proxy here if it's set.

Fixed.

> ofono-manager.c
> + UIProxy *ui = UI_PROXY(object);
> + GError *error = NULL;
> +
> + g_return_if_fail(priv != NULL);
> +
> + ui_proxy_ask_pin_finish(ui, res, &error);
>
> Don't you want to assign the return value to a gchar*? If you want to
> ignore it you are still leaking it right now.

Yes, and actually I forgot to fix this part. There's #ifdef FIXME a bit
above here. Is it ok if I fix this in an another branch I'm already
working on? It's easier for me that way.

I have now pushed the fixes to the branch. Please take a look.

--
Kalle Valo

[Mikkel Kamstrup Erlandsen (kamstrup)]

The additions to the README are spot on thanks a bunch.

If you swear to address the FIXMEs then the branch is approved with top marks ;-)

review: Approve

[Kalle Valo (kvalo)]

Mikkel Kamstrup Erlandsen <email address hidden> writes:

> If you swear to address the FIXMEs then the branch is approved with
> top marks ;-)

[holding left hand on top of the emacs manual and right hand up]

I swear

:D

--
Kalle Valo

=== modified file 'README'
--- README	2010-05-19 07:49:00 +0000
+++ README	2010-11-26 12:12:27 +0000
@@ -0,0 +1,49 @@
+indicator-network - UI for Connection Mananager (connman)
+
+indicator-network is a user interface for Connection Manager and also
+uses the indicator framework. The source code consists of three
+components, all are under src directory.
+
+src/indicator contains the module running inside indicator, for
+example indicator-applet in gnome panel. There's also a custom widget
+service-menuitem for showing networks in the network menu.
+
+src/backend contains a separate daemon running as a backend process.
+The name of process is indicator-network-service, but it will be
+renamed at some point. The process uses dbusmenu to show the network
+menu in the indicator.
+
+The description of various backend classes is:
+
+o manager: creates other objects needed and manages connman
+  disconnections
+
+o manager-proxy: a dbus proxy for handling dbus interface between the
+  indicator and backend
+
+o network-menu: manages the network menu using dbusmenu and handles
+  all events related to the menu
+
+o ofono-manager: manages all communication to ofono
+
+o service: dbusmenu menuitem for a network (called as service in
+  connman)
+
+o service-manager: manages all services related tasks, for example
+  service (ie. network) updates
+
+o ui-proxy: proxy for the ui process, shows different dialogs
+
+src/agent contains code showing dialogs. It will be renamed to src/ui
+at some point.
+
+There's also scripts/indicator-network-settings to show various
+network settings to the user and
+scripts/indicator-network-mobile-wizard which will be started when a
+new unconfigured modem is inserted.
+
+Unit tests are in tests and can be run with 'make check'.
+
+For testing indicator-network there are connman-mock and ofono-mock in
+tests/connman-mock directory. These can be used as fake connmand and
+ofonod daemons and make it easier to test special cases.

=== modified file 'src/backend/Makefile.am'
--- src/backend/Makefile.am	2010-11-04 10:22:03 +0000
+++ src/backend/Makefile.am	2010-11-26 12:12:27 +0000
@@ -17,13 +17,16 @@
     network-menu.c \
     network-menu.h \
 	ofono-manager.c \
-	ofono-manager.h
+	ofono-manager.h \
+	ui-proxy.c \
+	ui-proxy.h
 
 indicator_network_service_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUSMENUGLIB_CFLAGS) \
 	$(INDICATOR_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
+	$(CONNMAN_CFLAGS) \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DBINDIR=\"$(bindir)\"
 
@@ -32,5 +35,6 @@
 	$(DBUSMENUGLIB_LIBS) \
 	$(INDICATOR_LIBS) \
 	$(LIBNOTIFY_LIBS) \
+	$(CONNMAN_LIBS) \
 	$(top_builddir)/src/common/libmarshal.la \
 	$(top_builddir)/src/common/liblog.la

=== modified file 'src/backend/manager.c'
--- src/backend/manager.c	2010-11-17 13:54:50 +0000
+++ src/backend/manager.c	2010-11-26 12:12:27 +0000
@@ -18,6 +18,35 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * FIXME: libconnman todo list:
+ *
+ * o technology handling:
+ * -  g_signal_emit(self, signals[TECHNOLOGY_STATE_CHANGED], 0,
+ * -               CONNMAN_TECHNOLOGY_WIFI, wifi);
+ * -  g_signal_emit(self, signals[TECHNOLOGY_STATE_CHANGED], 0,
+ * -               CONNMAN_TECHNOLOGY_ETHERNET, ethernet);
+ * -  g_signal_emit(self, signals[TECHNOLOGY_STATE_CHANGED], 0,
+ * -               CONNMAN_TECHNOLOGY_CELLULAR, cellular);
+ *
+ *
+ * o implement_request_scan()
+ *
+ * o handle wifi enable/disable errors:
+ *
+ * -  g_warning("Failed to enable wireless: %s", error->message);
+ * -
+ * -  summary = _("Wireless");
+ * -  msg = _("Failed to enable wireless");
+ * -  icon = ICON_NOTIFICATION_WIFI_FULL;
+ *
+ * -  g_warning("Failed to disable wireless: %s", error->message);
+ * -
+ * -  summary = _("Wireless");
+ * -  msg = _("Failed to disable wireless");
+ * -  icon = ICON_NOTIFICATION_WIFI_FULL;
+ */
+
 #include "manager.h"
 
 #ifdef HAVE_CONFIG_H
@@ -33,8 +62,8 @@
 #include <libnotify/notify.h>
 
 #include "marshal.h"
-#include "connman-manager-client.h"
-#include "connman-service-client.h"
+#include "connman-manager.h"
+#include "connman-service.h"
 #include "service.h"
 #include "connman.h"
 #include "dbus-shared-names.h"
@@ -44,6 +73,7 @@
 #include "log.h"
 #include "manager-proxy.h"
 #include "ofono-manager.h"
+#include "ui-proxy.h"
 
 G_DEFINE_TYPE(Manager, manager, G_TYPE_OBJECT)
 
@@ -55,11 +85,11 @@
 struct _ManagerPrivate {
   ManagerProxy *ns_dbus;
   ServiceManager *service_manager;
-  DBusGProxy *connman_proxy;
-  DBusGProxy *dbus_proxy;
-  DBusGProxy *agent_proxy;
-  DBusGConnection *system_bus;
-  DBusGConnection *session_bus;
+
+  ConnmanManager *connman;
+
+  UIProxy *ui;
+
   NotifyNotification *notification;
   guint animation_timer;
   gint animation_counter;
@@ -81,14 +111,6 @@
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-struct service_state_string
-{
-  const gchar *str;
-  ServiceState state;
-};
-
-#define NETWORK_AGENT LIBEXECDIR "/indicator-network-agent"
-
 #define CONNECTING_ANIMATION_TIMEOUT 100
 
 static void stop_connecting_animation(Manager *self);
@@ -158,12 +180,12 @@
 {
 }
 
-const gchar *manager_icon_name(const gchar *technology, gint signal)
+const gchar *manager_icon_name(ConnmanServiceType type, gint signal)
 {
-  if (g_str_equal(technology, CONNMAN_TECHNOLOGY_ETHERNET)) {
+  switch (type) {
+  case CONNMAN_SERVICE_TYPE_ETHERNET:
     return ICON_CONNECTED_WIRED;
-  }
-  else if (g_str_equal(technology, CONNMAN_TECHNOLOGY_WIFI)) {
+  case CONNMAN_SERVICE_TYPE_WIFI:
     if (signal > 75)
        return ICON_CONNECTED_WIFI_100;
     else if (signal > 50)
@@ -174,15 +196,13 @@
       return ICON_CONNECTED_WIFI_25;
     else
       return ICON_CONNECTED_WIFI_0;
-  }
-  else if (g_str_equal(technology, CONNMAN_TECHNOLOGY_CELLULAR)) {
+  case CONNMAN_SERVICE_TYPE_CELLULAR:
     return ICON_CONNECTED_CELLULAR;
-  }
-  else if (g_str_equal(technology, CONNMAN_TECHNOLOGY_BLUETOOTH)) {
+  case CONNMAN_SERVICE_TYPE_BLUETOOTH:
     return ICON_CONNECTED_BLUETOOTH;
+  default:
+    return ICON_CONNECTED_DEFAULT;
   }
-
-  return ICON_CONNECTED_DEFAULT;
 }
 
 static void set_animation_icon(Manager *self)
@@ -251,6 +271,8 @@
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
 
+  g_return_if_fail(priv != NULL);
+
   if (priv->animation_timer == 0)
 	  return;
 
@@ -285,7 +307,8 @@
 static void update_icon(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
-  const gchar *technology, *icon_name;
+  ConnmanServiceType type;
+  const gchar *icon_name;
 
   g_return_if_fail(self);
 
@@ -301,14 +324,9 @@
     goto done;
   }
 
-  technology = service_manager_get_default_technology(priv->service_manager);
-
-  if (technology == NULL || strlen(technology) == 0) {
-    icon_name = ICON_DISCONNECTED;
-    goto done;
-  }
-
-  icon_name = manager_icon_name(technology, priv->signal_strength);
+  type = service_manager_get_default_technology(priv->service_manager);
+
+  icon_name = manager_icon_name(type, priv->signal_strength);
 
  done:
   manager_proxy_set_icon(priv->ns_dbus, icon_name);
@@ -359,340 +377,162 @@
   update_icon(self);
 }
 
-static void update_enabled_technologies(Manager *self, GValue *value)
-{
-  gboolean wifi, ethernet, cellular, bluetooth;
-  gchar **technologies;
-  int i;
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(G_VALUE_HOLDS_BOXED(value));
-
-  wifi = FALSE;
-  ethernet = FALSE;
-  cellular = FALSE;
-  bluetooth = FALSE;
-
-  technologies = g_value_get_boxed(value);
-
-  for (i = 0; technologies[i] != NULL; i++) {
-    if (g_strcmp0(technologies[i], CONNMAN_TECHNOLOGY_WIFI) == 0)
-      wifi = TRUE;
-    else if (g_strcmp0(technologies[i], CONNMAN_TECHNOLOGY_ETHERNET) == 0)
-      ethernet = TRUE;
-    else if (g_strcmp0(technologies[i], CONNMAN_TECHNOLOGY_CELLULAR) == 0)
-      cellular = TRUE;
-    else if (g_strcmp0(technologies[i], CONNMAN_TECHNOLOGY_BLUETOOTH) == 0)
-      bluetooth = TRUE;
-  }
-
-  /* FIXME: how to handle bluetooth? */
-
-  g_signal_emit(self, signals[TECHNOLOGY_STATE_CHANGED], 0,
-  		CONNMAN_TECHNOLOGY_WIFI, wifi);
-  g_signal_emit(self, signals[TECHNOLOGY_STATE_CHANGED], 0,
-  		CONNMAN_TECHNOLOGY_ETHERNET, ethernet);
-  g_signal_emit(self, signals[TECHNOLOGY_STATE_CHANGED], 0,
-  		CONNMAN_TECHNOLOGY_CELLULAR, cellular);
-}
-
-static void connman_property_changed(DBusGProxy *proxy, const gchar *property,
-				     GValue *value, gpointer user_data)
-{
-  Manager *self = MANAGER(user_data);
-  ManagerPrivate *priv = GET_PRIVATE(self);
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(priv != NULL);
-
-  if (g_str_equal(property, CONNMAN_PROPERTY_SERVICES)) {
-    service_manager_update(priv->service_manager, value);
-  }
-  else if (g_str_equal(property, CONNMAN_PROPERTY_ENABLED_TECHNOLOGIES)) {
-    update_enabled_technologies(self, value);
-  }
-
-}
-
-static void update_all_properties(Manager *self)
-{
-  ManagerPrivate *priv = GET_PRIVATE(self);
-  GHashTable *properties;
-  GError *error = NULL;
-  GValue *value;
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(priv != NULL);
-
-  /* FIXME: should be async */
-  org_moblin_connman_Manager_get_properties(priv->connman_proxy,
-					    &properties, &error);
-
-  if (error) {
-    g_warning("%s(): org_moblin_connman_Manager_get_properties failed: %s",
-	      __func__, error->message);
-    g_error_free(error);
-    return;
-  }
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_SERVICES);
-  if (value)
-    service_manager_update(priv->service_manager, value);
-
-  value = g_hash_table_lookup(properties,
-			      CONNMAN_PROPERTY_ENABLED_TECHNOLOGIES);
-  if (value)
-    update_enabled_technologies(self, value);
-
-  /* now network menu can be enabled */
+static void update_services(Manager *self)
+{
+  ManagerPrivate *priv = GET_PRIVATE(self);
+  ConnmanService **services;
+
+  g_return_if_fail(priv != NULL);
+
+  services = connman_manager_get_services(priv->connman);
+
+  service_manager_update_services(priv->service_manager, services);
+}
+
+static void connman_service_added(ConnmanManager *proxy,
+				  ConnmanService *service,
+				  gpointer user_data)
+{
+  Manager *self = MANAGER(user_data);
+
+  update_services(self);
+}
+
+static void connman_service_removed(ConnmanManager *proxy, const gchar *path,
+				    gpointer user_data)
+{
+  Manager *self = MANAGER(user_data);
+
+  update_services(self);
+}
+
+static void connman_connected(Manager *self)
+{
+  ManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  g_debug("connected to connman");
+
+  start_agent(self);
+
+  update_services(self);
+
+  /* FIXME: create update_technologies() */
+
   network_menu_enable(priv->network_menu);
-
-  /* FIXME: free properties */
-}
-
-static gboolean start_routine(gpointer user_data)
-{
-  Manager *self = MANAGER(user_data);
-  ManagerPrivate *priv = GET_PRIVATE(self);
-
-  g_return_val_if_fail(self != NULL, FALSE);
-  g_return_val_if_fail(priv != NULL, FALSE);
-
-  update_all_properties(self);
-
-  /* return false so that this callback isn't called anymore */
-  return FALSE;
-}
-
-static void connman_proxy_destroy(DBusGProxy *proxy, gpointer user_data)
-{
-  Manager *self = MANAGER(user_data);
-  ManagerPrivate *priv = GET_PRIVATE(self);
-
-  g_return_if_fail(self != NULL);
+}
+
+static void connman_disconnected(Manager *self)
+{
+  ManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_debug("disconnected from connman");
+
   g_return_if_fail(priv != NULL);
 
-  if (priv->connman_proxy != NULL) {
-	  g_object_unref(priv->connman_proxy);
-	  priv->connman_proxy = NULL;
-  }
-
   network_menu_disable(priv->network_menu);
   service_manager_remove_all(priv->service_manager);
   stop_connecting_animation(self);
   manager_proxy_set_icon(priv->ns_dbus, ICON_DISCONNECTED);
   stop_agent(self);
-
-  g_debug("connman proxy destroyed");
-
-  return;
-}
-
-static void create_connman_proxy(Manager *self)
-{
-  ManagerPrivate *priv = GET_PRIVATE(self);
-  GError *error = NULL;
-
-  g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->system_bus != NULL);
-  g_return_if_fail(priv->connman_proxy == NULL);
-
-  priv->connman_proxy = dbus_g_proxy_new_for_name_owner(priv->system_bus,
-							CONNMAN_SERVICE_NAME,
-							CONNMAN_MANAGER_PATH,
-							CONNMAN_MANAGER_INTERFACE,
-							&error);
-
-  if (error != NULL) {
-    g_debug("unable to contact connmand, not running?");
-    network_menu_disable(priv->network_menu);
-    g_error_free(error);
-    return;
-  }
-
-  g_signal_connect(G_OBJECT(priv->connman_proxy), "destroy",
-		   G_CALLBACK(connman_proxy_destroy), self);
-
-  dbus_g_proxy_add_signal(priv->connman_proxy, CONNMAN_SIGNAL_PROPERTY_CHANGED,
-			  G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-
-  dbus_g_proxy_connect_signal(priv->connman_proxy,
-			      CONNMAN_SIGNAL_PROPERTY_CHANGED,
-			      G_CALLBACK(connman_property_changed),
-			      self, NULL);
-
-  g_debug("connman proxies created");
-
-  /* connmand is now running */
-
-  /* FIXME: start_routine should be deleted if connmand is gone again */
-  g_idle_add(start_routine, self);
-  start_agent(self);
-
-  return;
-}
-
-static void agent_proxy_destroy(DBusGProxy *proxy, gpointer user_data)
+}
+
+static void connman_connected_notify(ConnmanManager *connman, GParamSpec *pspec,
+				     gpointer user_data)
 {
   Manager *self = MANAGER(user_data);
+
+  if (connman_manager_is_connected(connman))
+    connman_connected(self);
+  else
+    connman_disconnected(self);
+}
+
+static void create_connman(Manager *self)
+{
   ManagerPrivate *priv = GET_PRIVATE(self);
 
-  g_return_if_fail(self != NULL);
   g_return_if_fail(priv != NULL);
 
-  g_object_unref(priv->agent_proxy);
-  priv->agent_proxy = NULL;
-
-  g_debug("agent proxy destroyed");
-
-  /* FIXME: start agent again if we didn't stop it */
+  priv->connman = connman_manager_new();
+
+  g_signal_connect(priv->connman, "notify::connected",
+		   G_CALLBACK(connman_connected_notify),
+		   self);
+  g_signal_connect(priv->connman, "service-added",
+		   G_CALLBACK(connman_service_added),
+		   self);
+  g_signal_connect(priv->connman, "service-removed",
+		   G_CALLBACK(connman_service_removed),
+		   self);
+
+  if (connman_manager_is_connected(priv->connman))
+    connman_connected(self);
+
+  /* otherwise wait for the connected signal */
+
   return;
 }
 
-static void create_agent_proxy(Manager *self)
+static void ui_connected_notify(UIProxy *ui, GParamSpec *pspec,
+				gpointer user_data)
+{
+  if (ui_proxy_is_connected(ui))
+    g_debug("ui connected");
+  else
+    g_debug("ui disconnected");
+
+  /* FIXME: start ui again if we didn't stop it */
+}
+
+static void create_ui_proxy(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
 
   g_return_if_fail(self != NULL);
   g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->session_bus != NULL);
 
   /* this should not be called agent_proxy is already created */
-  g_return_if_fail(priv->agent_proxy == NULL);
-
-  priv->agent_proxy = dbus_g_proxy_new_for_name(priv->session_bus,
-						INDICATOR_NETWORK_AGENT_NAME,
-						INDICATOR_NETWORK_AGENT_OBJECT,
-						INDICATOR_NETWORK_AGENT_INTERFACE);
-  if (priv->agent_proxy == NULL) {
-    g_warning("failed to create agent proxy");
-    return;
-  }
-
-  g_signal_connect(G_OBJECT(priv->agent_proxy), "destroy",
-		   G_CALLBACK(agent_proxy_destroy), self);
-
-  g_debug("agent proxy created");
-}
-
-static void dbus_namechange(DBusGProxy *proxy, const gchar *name,
-			    const gchar *prev, const gchar *new,
-			    gpointer user_data)
-{
-  Manager *self = MANAGER(user_data);
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(name != NULL);
-  g_return_if_fail(new != NULL);
-
-  if (g_strcmp0(name, CONNMAN_SERVICE_NAME) == 0 && strlen(new) > 0) {
-    g_debug("connman manager interface visible");
-    create_connman_proxy(self);
-  }
-  return;
-}
-
-static void create_dbus_proxy(Manager *self)
-{
-  ManagerPrivate *priv = GET_PRIVATE(self);
-  GError *error = NULL;
-
-  g_return_if_fail(self != NULL);
-  g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->system_bus != NULL);
-
-  /* Set up the dbus Proxy */
-  priv->dbus_proxy = dbus_g_proxy_new_for_name_owner(priv->system_bus,
-						     DBUS_SERVICE_DBUS,
-						     DBUS_PATH_DBUS,
-						     DBUS_INTERFACE_DBUS,
-						     &error);
-  if (error != NULL) {
-    g_warning("Unable to connect to DBus events: %s", error->message);
-    g_error_free(error);
-    return;
-  }
-
-  /* Configure the name owner changing */
-  dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged",
-			  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-			  G_TYPE_INVALID);
-  dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged",
-			      G_CALLBACK(dbus_namechange),
-			      self, NULL);
-
-}
-
-static void start_agent_cb(DBusGProxy *proxy, GError *error,
-			   gpointer user_data)
-{
-  if (error) {
-    g_warning("failed to start agent: %s", error->message);
-    g_error_free(error);
-  }
+  g_return_if_fail(priv->ui == NULL);
+
+  priv->ui = ui_proxy_new();
+
+  if (priv->ui == NULL) {
+    g_warning("failed to create ui proxy");
+    return;
+  }
+
+  g_signal_connect(priv->ui, "notify::connected",
+		   G_CALLBACK(ui_connected_notify),
+		   self);
+
+  g_debug("ui proxy created");
 }
 
 void start_agent(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
 
-  g_return_if_fail(self != NULL);
   g_return_if_fail(priv != NULL);
-
-  if (priv->agent_proxy == NULL)
-    return;
-
-  org_ayatana_indicator_network_agent_start_async(priv->agent_proxy,
-  						  start_agent_cb,
-  						  self);
-}
-
-static void stop_agent_cb(DBusGProxy *proxy, GError *error,
-			   gpointer user_data)
-{
-  if (error) {
-    g_warning("failed to stop agent: %s", error->message);
-    g_error_free(error);
-  }
+  g_return_if_fail(priv->ui != NULL);
+
+  ui_proxy_start(priv->ui);
 }
 
 void stop_agent(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
 
-  g_return_if_fail(self != NULL);
   g_return_if_fail(priv != NULL);
-
-  if (priv->agent_proxy == NULL)
-    return;
-
-  org_ayatana_indicator_network_agent_stop_async(priv->agent_proxy,
-						 stop_agent_cb,
-						 self);
+  g_return_if_fail(priv->ui != NULL);
+
+  ui_proxy_stop(priv->ui);
 }
 
 void manager_request_scan(Manager *self)
 {
-	ManagerPrivate *priv = GET_PRIVATE(self);
-	GError * error = NULL;
-
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(priv != NULL);
-
-	g_debug ("request scan");
-	if (priv->connman_proxy == NULL) {
-		g_warning ("but no connman instance available, so aborting");
-		return;
-	}
-
-	/* FIXME: use async */
-	org_moblin_connman_Manager_request_scan (priv->connman_proxy,
-											 "wifi", &error);
-	if (error != NULL) {
-		g_warning ("Error while trying to request scan: %s", error->message);
-		g_error_free (error);
-		return;
-	}
+  /* FIXME: implement connman_manager_request_scan() */
 }
 
 void manager_set_debug_level(Manager *self, gint level)
@@ -702,24 +542,24 @@
   log_set_debug(level > 0);
 }
 
-DBusGProxy *manager_get_agent(Manager *self)
+UIProxy *manager_get_ui(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
 
-  g_return_val_if_fail(self != NULL, NULL);
+  g_return_val_if_fail(IS_MANAGER(self), NULL);
   g_return_val_if_fail(priv != NULL, NULL);
 
-  return priv->agent_proxy;
+  return priv->ui;
 }
 
-DBusGProxy *manager_get_connman(Manager *self)
+ConnmanManager *manager_get_connman(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
 
   g_return_val_if_fail(self != NULL, NULL);
   g_return_val_if_fail(priv != NULL, NULL);
 
-  return priv->connman_proxy;
+  return priv->connman;
 }
 
 ServiceManager *manager_get_service_manager(Manager *self)
@@ -739,21 +579,10 @@
   ManagerPrivate *priv;
   gchar *icon;
   int i, j;
-  GError *error = NULL;
 
   self = g_object_new(TYPE_MANAGER, NULL);
   priv = GET_PRIVATE(self);
 
-  priv->system_bus = system_bus;
-
-  priv->session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-  if (error) {
-    g_critical("Unable to connect to the dbus session bus: %s",
-	       error->message);
-    g_error_free(error);
-    priv->session_bus = NULL;
-  }
-
   priv->ns_dbus = manager_proxy_new(self);
   priv->service_manager = service_manager_new(self);
   priv->network_menu = network_menu_new(self);
@@ -766,21 +595,8 @@
 		   "default-service-changed",
 		   G_CALLBACK(default_service_changed), self);
 
-
-  dbus_g_object_register_marshaller(_marshal_VOID__STRING_BOXED,
-                                    G_TYPE_NONE,
-                                    G_TYPE_STRING,
-                                    G_TYPE_VALUE,
-                                    G_TYPE_INVALID);
-
-  dbus_g_object_register_marshaller(_marshal_VOID__INT,
-                                    G_TYPE_NONE,
-                                    G_TYPE_INT,
-                                    G_TYPE_INVALID);
-
-  create_agent_proxy(self);
-  create_dbus_proxy(self);
-  create_connman_proxy(self);
+  create_ui_proxy(self);
+  create_connman(self);
 
   /* create icon names */
   for (i = 0; i < CONNECTING_ICON_STAGES; i++) {

=== modified file 'src/backend/manager.h'
--- src/backend/manager.h	2010-10-04 13:32:38 +0000
+++ src/backend/manager.h	2010-11-26 12:12:27 +0000
@@ -24,6 +24,9 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib-bindings.h>
 
+#include "connman-manager.h"
+#include "ui-proxy.h"
+
 G_BEGIN_DECLS
 
 #define TYPE_MANAGER manager_get_type()
@@ -86,11 +89,11 @@
 
 GType manager_get_type(void);
 
-const gchar *manager_icon_name(const gchar *technology, gint signal);
+const gchar *manager_icon_name(ConnmanServiceType type, gint signal);
 void manager_notify(Manager *self, const gchar *summary, const gchar *body,
 		    const gchar *icon);
-DBusGProxy *manager_get_agent(Manager *self);
-DBusGProxy *manager_get_connman(Manager *self);
+UIProxy *manager_get_ui(Manager *self);
+ConnmanManager *manager_get_connman(Manager *self);
 ServiceManager *manager_get_service_manager(Manager *self);
 void stop_agent(Manager *self);
 void manager_set_debug_level(Manager *self, gint level);

=== modified file 'src/backend/network-menu.c'
--- src/backend/network-menu.c	2010-10-01 12:58:01 +0000
+++ src/backend/network-menu.c	2010-11-26 12:12:27 +0000
@@ -424,78 +424,16 @@
   priv->wireless_enabled = state;
 }
 
-static void enable_wifi_cb(DBusGProxy *proxy, GError *error,
-			   gpointer user_data)
-{
-  NetworkMenu *self = user_data;
-  NetworkMenuPrivate *priv = GET_PRIVATE(self);
-  const gchar *summary, *msg, *icon;
-
-  if (error == NULL)
-    /* method call ended successfully, nothing to do */
-    return;
-
-  /* there was an error, notify the user */
-  g_warning("Failed to enable wireless: %s", error->message);
-
-  summary = _("Wireless");
-  msg = _("Failed to enable wireless");
-  icon = ICON_NOTIFICATION_WIFI_FULL;
-
-  manager_notify(priv->network_service, summary, msg, icon);
-
-  g_error_free(error);
-}
-
-static void disable_wifi_cb(DBusGProxy *proxy, GError *error,
-			    gpointer user_data)
-{
-  NetworkMenu *self = user_data;
-  NetworkMenuPrivate *priv = GET_PRIVATE(self);
-  const gchar *summary, *msg, *icon;
-
-  if (error == NULL)
-    /* method call ended successfully, nothing to do */
-    return;
-
-  /* there was an error, notify the user */
-  g_warning("Failed to disable wireless: %s", error->message);
-
-  summary = _("Wireless");
-  msg = _("Failed to disable wireless");
-  icon = ICON_NOTIFICATION_WIFI_FULL;
-
-  manager_notify(priv->network_service, summary, msg, icon);
-
-  g_error_free(error);
-}
-
 static void toggle_wireless_cb(DbusmenuMenuitem *mi, guint timestamp,
 			       gpointer user_data)
 {
   NetworkMenu *self = user_data;
   NetworkMenuPrivate *priv = GET_PRIVATE(self);
   Manager *ns = priv->network_service;
-  DBusGProxy *proxy;
 
   g_return_if_fail(ns != NULL);
 
-  /* FIXME: should manager_enable_technology() or similar */
-  proxy = manager_get_connman(priv->network_service);
-
-  if (proxy == NULL)
-    return;
-
-  if (priv->wireless_enabled)
-    org_moblin_connman_Manager_disable_technology_async(proxy,
-							CONNMAN_TECHNOLOGY_WIFI,
-							disable_wifi_cb,
-							self);
-  else
-    org_moblin_connman_Manager_enable_technology_async(proxy,
-						       CONNMAN_TECHNOLOGY_WIFI,
-						       enable_wifi_cb,
-						       self);
+  /* FIXME: enable or disable wireless accordingly */
 }
 
 static void network_settings_activated(DbusmenuMenuitem *mi, guint timestamp,
@@ -510,34 +448,20 @@
   g_spawn_async(NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
 }
 
-static void show_wireless_connect_reply(DBusGProxy *proxy, GError *error,
-					gpointer user_data)
-{
-  if (error) {
-    g_critical("Unable to show wireless connect dialog: %s",
-	       error->message);
-    g_error_free(error);
-    return;
-  }
-}
-
 static void wireless_other_activated(DbusmenuMenuitem *mi, guint timestamp,
 				       gpointer user_data)
 {
   NetworkMenu *self = user_data;
   NetworkMenuPrivate *priv = GET_PRIVATE(self);
   Manager *ns = priv->network_service;
-  DBusGProxy *agent;
-
-  agent = manager_get_agent(ns);
-
-  if (agent == NULL)
+  UIProxy *ui;
+
+  ui = manager_get_ui(ns);
+
+  if (ui == NULL)
     return;
 
-  org_ayatana_indicator_network_agent_show_wireless_connect_async(agent,
-								  show_wireless_connect_reply,
-								  self);
-
+  ui_proxy_show_wireless_connect(ui);
 }
 
 NetworkMenu *network_menu_new(Manager *ns)

=== modified file 'src/backend/ofono-manager.c'
--- src/backend/ofono-manager.c	2010-11-05 11:36:06 +0000
+++ src/backend/ofono-manager.c	2010-11-26 12:12:27 +0000
@@ -39,7 +39,7 @@
 struct _OfonoManagerPrivate {
   DBusGConnection *system_bus;
   DBusGProxy *manager;
-  DBusGProxy *agent;
+  UIProxy *ui;
   GHashTable *modems;
   GHashTable *sims;
 
@@ -48,6 +48,7 @@
 
 #define PIN_TYPE_PIN "pin"
 
+#ifdef FIXME
 static void enter_pin_cb(DBusGProxy *proxy, GError *error, gpointer user_data)
 {
   OfonoManager *self = OFONO_MANAGER(user_data);
@@ -73,23 +74,36 @@
   org_ofono_SimManager_enter_pin_async(proxy, type, pin,
 				       enter_pin_cb, self);
 }
+#endif
 
-static void ask_pin_cb(DBusGProxy *proxy, char *pin, GError *error,
+static void ask_pin_cb(GObject *object, GAsyncResult *res,
 		       gpointer user_data)
 {
   OfonoManager *self = OFONO_MANAGER(user_data);
   OfonoManagerPrivate *priv = GET_PRIVATE(self);
+  UIProxy *ui = UI_PROXY(object);
+  GError *error = NULL;
+
+  g_return_if_fail(priv != NULL);
+
+  ui_proxy_ask_pin_finish(ui, res, &error);
+
+  if (error != NULL) {
+    g_warning("ask pin failed: %s\n", error->message);
+    g_error_free(error);
+    return;
+  }
 
   g_return_if_fail(priv->current_sim != NULL);
 
+#ifdef FIXME /* finish should return the pin */
   if (pin == NULL || strlen(pin) == 0) {
     priv->current_sim = NULL;
     return;
   }
 
   enter_pin(self, priv->current_sim, PIN_TYPE_PIN, pin);
-
-  /* FIXME: should free pin? */
+#endif
 }
 
 static void ask_pin(OfonoManager *self, DBusGProxy *proxy)
@@ -102,8 +116,7 @@
   }
 
   priv->current_sim = proxy;
-  org_ayatana_indicator_network_agent_ask_pin_async(priv->agent, PIN_TYPE_PIN,
-						    ask_pin_cb, self);
+  ui_proxy_ask_pin(priv->ui, PIN_TYPE_PIN, NULL, ask_pin_cb, self);
 }
 
 static void update_pin_required(OfonoManager *self, DBusGProxy *proxy,
@@ -439,9 +452,9 @@
     priv->manager = NULL;
   }
 
-  if (priv->agent != NULL) {
-    g_object_unref(priv->agent);
-    priv->agent = NULL;
+  if (priv->ui != NULL) {
+    g_object_unref(priv->ui);
+    priv->ui = NULL;
   }
 
   if (priv->modems != NULL) {
@@ -513,10 +526,10 @@
   self = g_object_new(TYPE_OFONO_MANAGER, NULL);
 
   priv = GET_PRIVATE(self);
-  priv->agent = manager_get_agent(manager);
-  g_object_ref(priv->agent);
+  priv->ui = manager_get_ui(manager);
+  g_object_ref(priv->ui);
 
-  g_return_val_if_fail(priv->agent != NULL, NULL);
+  g_return_val_if_fail(priv->ui != NULL, NULL);
 
   return self;
 }

=== modified file 'src/backend/service-manager.c'
--- src/backend/service-manager.c	2010-10-04 10:22:51 +0000
+++ src/backend/service-manager.c	2010-11-26 12:12:27 +0000
@@ -175,33 +175,20 @@
 		service_get_strength(service));
 }
 
-static void iterate_services(const GValue *value, gpointer user_data)
-{
-  GList **new_paths = user_data;
-  gchar *path;
-
-  path = g_value_dup_boxed (value);
-  if (!path)
-    return;
-
-  *new_paths = g_list_append(*new_paths, path);
-}
-
-void service_manager_update(ServiceManager *self, GValue *value)
+void service_manager_update_services(ServiceManager *self,
+				     ConnmanService **services)
 {
   ServiceManagerPrivate *priv = GET_PRIVATE(self);
-  GList *new_paths = NULL, *iter, *old_services, *link;
+  GList *old_services, *link;
   Service *service;
-  gchar *path;
+  const gchar *path;
   gint count = 0;
 
-  dbus_g_type_collection_value_iterate(value, iterate_services, &new_paths);
-
   old_services = priv->services;
   priv->services = NULL;
 
-  for (iter = new_paths; iter != NULL; iter = iter->next) {
-    path = iter->data;
+  for (; *services != NULL; services++) {
+    path = connman_service_get_path(*services);
 
     /* check if we already have this service and reuse it */
     link = service_manager_find(old_services, path);
@@ -210,11 +197,11 @@
       old_services = g_list_delete_link(old_services, link);
       link = NULL;
     } else {
-      service = service_new(path, priv->network_service);
+      service = service_new(*services, priv->network_service);
       g_signal_connect(G_OBJECT(service), "state-changed",
-		       G_CALLBACK(service_state_changed), self);
+      		       G_CALLBACK(service_state_changed), self);
       g_signal_connect(G_OBJECT(service), "strength-updated",
-		       G_CALLBACK(service_strength_updated), self);
+      		       G_CALLBACK(service_strength_updated), self);
 
       count++;
     }
@@ -241,16 +228,6 @@
   /* remove unavailable services, we don't want to show them anymore */
   service_manager_free_all(old_services);
   old_services = NULL;
-
-  if (new_paths) {
-    for (iter = new_paths; iter != NULL; iter = iter->next) {
-      g_free(iter->data);
-      iter->data = NULL;
-    }
-
-    g_list_free(new_paths);
-    new_paths = NULL;
-  }
 }
 
 GList *service_manager_get_wired(ServiceManager *self)
@@ -261,8 +238,7 @@
 
   for (iter = priv->services; iter != NULL; iter = iter->next) {
     service = iter->data;
-    if (g_strcmp0(service_get_tech(service),
-		  CONNMAN_TECHNOLOGY_ETHERNET) == 0) {
+    if (service_get_service_type(service) == CONNMAN_SERVICE_TYPE_ETHERNET) {
       list = g_list_append(list, service);
     }
   }
@@ -278,7 +254,7 @@
 
   for (iter = priv->services; iter != NULL; iter = iter->next) {
     service = iter->data;
-    if (g_strcmp0(service_get_tech(service), CONNMAN_TECHNOLOGY_WIFI) == 0) {
+    if (service_get_service_type(service) == CONNMAN_SERVICE_TYPE_WIFI) {
       list = g_list_append(list, service);
 
       /* show only certain number of wireless networks */
@@ -294,15 +270,16 @@
 {
   ServiceManagerPrivate *priv = GET_PRIVATE(self);
   GList *list = NULL, *iter;
+  ConnmanServiceType type;
   Service *service;
 
   for (iter = priv->services; iter != NULL; iter = iter->next) {
     service = iter->data;
-    if (g_strcmp0(service_get_tech(service),
-		  CONNMAN_TECHNOLOGY_CELLULAR) == 0) {
+    type = service_get_service_type(service);
+
+    if (type == CONNMAN_SERVICE_TYPE_CELLULAR) {
       list = g_list_append(list, service);
-    } else if (g_strcmp0(service_get_tech(service),
-			 CONNMAN_TECHNOLOGY_BLUETOOTH) == 0) {
+    } else if (type == CONNMAN_SERVICE_TYPE_BLUETOOTH) {
       list = g_list_append(list, service);
     }
   }
@@ -318,8 +295,8 @@
 
   for (iter = priv->services; iter != NULL; iter = iter->next) {
     service = iter->data;
-    if (service_get_state(service) == SERVICE_STATE_ASSOCIATION ||
-	service_get_state(service) == SERVICE_STATE_CONFIGURATION) {
+    if (service_get_state(service) == CONNMAN_SERVICE_STATE_ASSOCIATION ||
+	service_get_state(service) == CONNMAN_SERVICE_STATE_CONFIGURATION) {
       return TRUE;
     }
   }
@@ -336,7 +313,7 @@
 {
   ServiceManagerPrivate *priv = GET_PRIVATE(self);
   Service *service;
-  ServiceState state;
+  ConnmanServiceState state;
   GList *iter;
   guint result = 0;
 
@@ -344,8 +321,9 @@
     service = iter->data;
     state = service_get_state(service);
 
-    if (state == SERVICE_STATE_READY || state == SERVICE_STATE_LOGIN ||
-	state == SERVICE_STATE_ONLINE) {
+    if (state == CONNMAN_SERVICE_STATE_READY ||
+	state == CONNMAN_SERVICE_STATE_LOGIN ||
+	state == CONNMAN_SERVICE_STATE_ONLINE) {
       result++;
     }
   }
@@ -353,18 +331,18 @@
   return result;
 }
 
-const gchar *service_manager_get_default_technology(ServiceManager *self)
+ConnmanServiceType service_manager_get_default_technology(ServiceManager *self)
 {
   Service *service;
 
-  g_return_val_if_fail(IS_SERVICE_MANAGER(self), NULL);
+  g_return_val_if_fail(IS_SERVICE_MANAGER(self), CONNMAN_SERVICE_TYPE_ETHERNET);
 
   service = service_manager_get_default_service(self);
 
   if (service == NULL)
-    return "";
+    return CONNMAN_SERVICE_TYPE_ETHERNET;
 
-  return service_get_tech(service);
+  return service_get_service_type(service);
 }
 
 Service *service_manager_get_default_service(ServiceManager *self)

=== modified file 'src/backend/service-manager.h'
--- src/backend/service-manager.h	2010-09-30 13:58:58 +0000
+++ src/backend/service-manager.h	2010-11-26 12:12:27 +0000
@@ -59,7 +59,8 @@
 
 ServiceManager *service_manager_new(Manager *ns);
 void service_manager_free(ServiceManager *self);
-void service_manager_update(ServiceManager *self, GValue *value);
+void service_manager_update_services(ServiceManager *self,
+				     ConnmanService **services);
 void service_manager_remove_all(ServiceManager *self);
 GList *service_manager_get_wired(ServiceManager *self);
 GList *service_manager_get_wireless(ServiceManager *self);
@@ -67,7 +68,7 @@
 gboolean service_manager_is_connecting(ServiceManager *self);
 gboolean service_manager_is_connected(ServiceManager *self);
 guint service_manager_get_connected(ServiceManager *self);
-const gchar *service_manager_get_default_technology(ServiceManager *self);
+ConnmanServiceType service_manager_get_default_technology(ServiceManager *self);
 Service *service_manager_get_default_service(ServiceManager *self);
 guint service_manager_get_strength(ServiceManager *self);
 

=== modified file 'src/backend/service.c'
--- src/backend/service.c	2010-11-17 13:54:50 +0000
+++ src/backend/service.c	2010-11-26 12:12:27 +0000
@@ -49,19 +49,9 @@
 typedef struct _ServicePrivate ServicePrivate;
 
 struct _ServicePrivate {
-  gchar *path;
-  gchar *name;
-  gchar *type;
   Manager *network_service;
-  DbusmenuMenuitem *menuitem;
-  DBusGProxy *proxy;
-  ServiceState state;
-  gint signal_strength;
-  gchar *error;
-  gchar *security;
-  DBusGProxyCall *connect_call;
-  DBusGProxyCall *disconnect_call;
-  DBusGProxyCall *show_error_call;
+  ConnmanService *service;
+  ConnmanServiceState state;
 };
 
 enum {
@@ -73,47 +63,19 @@
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-struct service_state_string
-{
-  const gchar *str;
-  ServiceState state;
-};
-
-static const struct service_state_string service_state_map[] = {
-  { "unknown", SERVICE_STATE_UNKNOWN },
-  { "idle", SERVICE_STATE_IDLE },
-  { "failure", SERVICE_STATE_FAILURE },
-  { "association", SERVICE_STATE_ASSOCIATION },
-  { "configuration", SERVICE_STATE_CONFIGURATION },
-  { "ready", SERVICE_STATE_READY },
-  { "login", SERVICE_STATE_LOGIN },
-  { "online", SERVICE_STATE_ONLINE },
-  { "disconnect", SERVICE_STATE_DISCONNECT },
-};
-
 static void service_dispose(GObject *object)
 {
   Service *self = SERVICE(object);
   ServicePrivate *priv = GET_PRIVATE(self);
 
-  if (priv->connect_call != NULL && priv->proxy != NULL) {
-    dbus_g_proxy_cancel_call(priv->proxy, priv->connect_call);
-    priv->connect_call = NULL;
-  }
-
-  if (priv->disconnect_call != NULL && priv->proxy != NULL) {
-    dbus_g_proxy_cancel_call(priv->proxy, priv->disconnect_call);
-    priv->disconnect_call = NULL;
-  }
-
-  if (priv->show_error_call != NULL && priv->proxy != NULL) {
-    dbus_g_proxy_cancel_call(priv->proxy, priv->show_error_call);
-    priv->show_error_call = NULL;
-  }
-
-  if (priv->proxy != NULL) {
-    g_object_unref(priv->proxy);
-    priv->proxy = NULL;
+  if (priv->service != NULL) {
+    g_object_unref(priv->service);
+    priv->service = NULL;
+  }
+
+  if (priv->network_service != NULL) {
+    g_object_unref(priv->network_service);
+    priv->network_service = NULL;
   }
 
   G_OBJECT_CLASS (service_parent_class)->dispose (object);
@@ -122,25 +84,9 @@
 static void service_finalize(GObject *object)
 {
   Service *self = SERVICE(object);
-  ServicePrivate *priv = GET_PRIVATE(self);
 
   g_debug("[%p] service finalize", self);
 
-  g_free(priv->path);
-  priv->path = NULL;
-
-  g_free(priv->name);
-  priv->name = NULL;
-
-  g_free(priv->type);
-  priv->type = NULL;
-
-  g_free(priv->error);
-  priv->error = NULL;
-
-  g_free(priv->security);
-  priv->security = NULL;
-
   G_OBJECT_CLASS (service_parent_class)->finalize (object);
 }
 
@@ -176,31 +122,31 @@
 {
   ServicePrivate *priv = GET_PRIVATE(self);
 
-  g_return_val_if_fail(priv != NULL, "");
-  g_return_val_if_fail(priv->type != NULL, "");
+  g_return_val_if_fail(priv != NULL, NULL);
 
-  if (g_strcmp0(priv->type, CONNMAN_TECHNOLOGY_WIFI) == 0)
+  switch (connman_service_get_service_type(priv->service)) {
+  case CONNMAN_SERVICE_TYPE_WIFI:
     return ICON_NOTIFICATION_WIFI_DISCONNECTED;
-  else if (g_strcmp0(priv->type, CONNMAN_TECHNOLOGY_ETHERNET) == 0)
+  case CONNMAN_SERVICE_TYPE_ETHERNET:
     return ICON_NOTIFICATION_WIRED_DISCONNECTED;
-  else if (g_strcmp0(priv->type, CONNMAN_TECHNOLOGY_CELLULAR) == 0)
+  case CONNMAN_SERVICE_TYPE_CELLULAR:
     return ICON_NOTIFICATION_CELLULAR_DISCONNECTED;
-  else
+  default:
     return ICON_NOTIFICATION_WIRED_DISCONNECTED;
+  }
 }
 
-
-static void service_connect_cb(DBusGProxy *proxy, GError *error,
-			       gpointer user_data)
+static void service_connect_cb(GObject *object, GAsyncResult *res,
+				  gpointer user_data)
 {
   Service *self = user_data;
   ServicePrivate *priv = GET_PRIVATE(self);
   const gchar *summary, *msg, *icon;
+  GError *error = NULL;
 
   g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->connect_call != NULL);
 
-  priv->connect_call = NULL;
+  connman_service_connect_finish(priv->service, res, &error);
 
   if (error == NULL)
     /* method call had no errors */
@@ -209,9 +155,9 @@
   /* FIXME: don't show errors if passphrase is requested through agent */
 
   g_warning("[%p] failed to connect service %s: %s",
-	    self, priv->path, error->message);
+	    self, connman_service_get_path(priv->service), error->message);
 
-  summary = priv->name;
+  summary = connman_service_get_name(priv->service);
   msg = _("Connection Failed");
   icon = get_disconnected_icon(self);
 
@@ -223,44 +169,34 @@
 static void service_connect(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
-  DBusGProxyCall *call;
-
-  g_return_if_fail(priv);
-  g_return_if_fail(priv->proxy);
-
-  if (priv->connect_call != NULL) {
-    g_debug("[%p] connect call already in progress", self);
-    return;
-  }
+
+  g_return_if_fail(priv != NULL);
 
   g_debug("[%p] connect", self);
 
-  call = org_moblin_connman_Service_connect_async(priv->proxy,
-						  service_connect_cb,
-						  self);
-  priv->connect_call = call;
+  connman_service_connect(priv->service, service_connect_cb, self);
 }
 
-static void service_disconnect_cb(DBusGProxy *proxy, GError *error,
-			       gpointer user_data)
+static void service_disconnect_cb(GObject *object, GAsyncResult *res,
+				  gpointer user_data)
 {
-  Service *self = user_data;
+  Service *self = SERVICE(user_data);
   ServicePrivate *priv = GET_PRIVATE(self);
   const gchar *summary, *msg, *icon;
+  GError *error = NULL;
 
   g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->disconnect_call != NULL);
 
-  priv->disconnect_call = NULL;
+  connman_service_disconnect_finish(priv->service, res, &error);
 
   if (error == NULL)
     /* method call had no errors */
     return;
 
   g_warning("[%p] failed to disconnect service %s: %s",
-	    self, priv->path, error->message);
+	    self, connman_service_get_path(priv->service), error->message);
 
-  summary = priv->name;
+  summary = connman_service_get_name(priv->service);
   msg = _("Disconnection Failed");
   icon = get_disconnected_icon(self);
 
@@ -272,22 +208,13 @@
 static void service_disconnect(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
-  DBusGProxyCall *call;
-
-  g_return_if_fail(priv);
-  g_return_if_fail(priv->proxy);
-
-  if (priv->disconnect_call != NULL) {
-    g_debug("[%p] disconnect call already in progress", self);
-    return;
-  }
+
+  g_return_if_fail(priv != NULL);
+  g_return_if_fail(priv->service != NULL);
 
   g_debug("[%p] disconnect", self);
 
-  call = org_moblin_connman_Service_disconnect_async(priv->proxy,
-						     service_disconnect_cb,
-						     self);
-  priv->disconnect_call = call;
+  connman_service_disconnect(priv->service, service_disconnect_cb, self);
 }
 
 static void service_item_activated(DbusmenuMenuitem *mi, guint timestamp,
@@ -298,17 +225,17 @@
 
   g_return_if_fail(priv != NULL);
 
-  switch (priv->state) {
-  case SERVICE_STATE_IDLE:
-  case SERVICE_STATE_FAILURE:
-  case SERVICE_STATE_DISCONNECT:
+  switch (connman_service_get_state(priv->service)) {
+  case CONNMAN_SERVICE_STATE_IDLE:
+  case CONNMAN_SERVICE_STATE_FAILURE:
+  case CONNMAN_SERVICE_STATE_DISCONNECT:
     service_connect(self);
     break;
-  case SERVICE_STATE_ASSOCIATION:
-  case SERVICE_STATE_CONFIGURATION:
-  case SERVICE_STATE_READY:
-  case SERVICE_STATE_LOGIN:
-  case SERVICE_STATE_ONLINE:
+  case CONNMAN_SERVICE_STATE_ASSOCIATION:
+  case CONNMAN_SERVICE_STATE_CONFIGURATION:
+  case CONNMAN_SERVICE_STATE_READY:
+  case CONNMAN_SERVICE_STATE_LOGIN:
+  case CONNMAN_SERVICE_STATE_ONLINE:
     service_disconnect(self);
     break;
   default:
@@ -316,49 +243,15 @@
   }
 }
 
-static ServiceState service_str2state(const gchar *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 (g_str_equal(s->str, state))
-      return s->state;
-  }
-
-  g_warning("%s(): unknown state %s", __func__, state);
-
-  return SERVICE_STATE_IDLE;
-}
-
-static const gchar *service_state2str(ServiceState 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";
-}
-
 static void service_update_label(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
 
   g_return_if_fail(priv);
-  g_return_if_fail(priv->name);
-  g_return_if_fail(strlen(priv->name) > 0);
 
   dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self),
 				 DBUSMENU_MENUITEM_PROP_LABEL,
-				 priv->name);
+				 connman_service_get_name(priv->service));
 }
 
 static void service_update_checkmark(Service *self)
@@ -368,16 +261,16 @@
 
   g_return_if_fail(priv);
 
-  switch (priv->state) {
-  case SERVICE_STATE_READY:
-  case SERVICE_STATE_LOGIN:
-  case SERVICE_STATE_ONLINE:
+  switch (connman_service_get_state(priv->service)) {
+  case CONNMAN_SERVICE_STATE_READY:
+  case CONNMAN_SERVICE_STATE_LOGIN:
+  case CONNMAN_SERVICE_STATE_ONLINE:
     state = DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED;
     break;
-  case SERVICE_STATE_IDLE:
-  case SERVICE_STATE_FAILURE:
-  case SERVICE_STATE_ASSOCIATION:
-  case SERVICE_STATE_CONFIGURATION:
+  case CONNMAN_SERVICE_STATE_IDLE:
+  case CONNMAN_SERVICE_STATE_FAILURE:
+  case CONNMAN_SERVICE_STATE_ASSOCIATION:
+  case CONNMAN_SERVICE_STATE_CONFIGURATION:
   default:
     state = DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED;
     break;
@@ -388,116 +281,100 @@
 				     state);
 }
 
-static void show_connect_error_cb(DBusGProxy *proxy, GError *error,
-				  gpointer user_data)
-{
-  Service *self = user_data;
-  ServicePrivate *priv = GET_PRIVATE(self);
-
-  g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->show_error_call != NULL);
-
-  priv->show_error_call = NULL;
-
-  if (error != NULL) {
-    g_warning("%s(): failed to show connection error: %s",
-	      __func__, error->message);
-    g_error_free(error);
-  }
-}
-
 static void show_connect_error(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
-  DBusGProxy *proxy = manager_get_agent(priv->network_service);
   const gchar *error_type = "general-connect-error";
-  DBusGProxyCall *call;
-
-  if (g_strcmp0(priv->type, CONNMAN_TECHNOLOGY_WIFI) == 0) {
-    if (g_strcmp0(priv->security, "none") == 0) {
+  ConnmanServiceSecurity security;
+  ConnmanServiceState state;
+  ConnmanServiceType type;
+
+  g_return_if_fail(priv != NULL);
+
+  type = connman_service_get_service_type(priv->service);
+  security = connman_service_get_security(priv->service);
+  state = connman_service_get_state(priv->service);
+
+  if (type == CONNMAN_SERVICE_TYPE_WIFI) {
+    if (security == CONNMAN_SERVICE_SECURITY_NONE) {
       error_type = "wifi-open-connect-error";
     }
-    else if (g_strcmp0(priv->security, "wep") == 0) {
-      if (priv->state == SERVICE_STATE_CONFIGURATION)
+    else if (security == CONNMAN_SERVICE_SECURITY_WEP) {
+      if (state == CONNMAN_SERVICE_STATE_CONFIGURATION)
 	error_type = "wifi-wep-dhcp-error";
       else
 	error_type = "wifi-wep-connect-error";
     }
-    else if ((g_strcmp0(priv->security, "wpa") == 0) ||
-	     (g_strcmp0(priv->security, "psk") == 0) ||
-	     (g_strcmp0(priv->security, "rsn") == 0)) {
-      if (priv->state == SERVICE_STATE_CONFIGURATION)
+    else if (security == CONNMAN_SERVICE_SECURITY_PSK) {
+      if (state == CONNMAN_SERVICE_STATE_CONFIGURATION)
 	error_type = "wifi-wpa-dhcp-error";
       else
 	error_type = "wifi-wpa-connect-error";
     }
   }
 
-  call = org_ayatana_indicator_network_agent_show_connect_error_async(proxy,
-  								      error_type,
-  								      show_connect_error_cb,
-  								      self);
-  priv->show_error_call = call;
+  /* FIXME: show error dialogs */
 }
 
-static void service_update_state(Service *self, const gchar *state)
+static void state_updated(ConnmanService *service, GParamSpec *pspec,
+			  gpointer user_data)
 {
+  Service *self = SERVICE(user_data);
   ServicePrivate *priv = GET_PRIVATE(self);
-  ServiceState new_state;
+  ConnmanServiceState new_state;
+  ConnmanServiceType type;
   const gchar *icon;
 
-  g_return_if_fail(priv);
-  g_return_if_fail(priv->type);
-  g_return_if_fail(state);
-
-  g_debug("[%p] %s -> %s", self, service_state2str(priv->state),
-	  state);
-
-  new_state = service_str2state(state);
+  g_return_if_fail(priv != NULL);
+
+  new_state = connman_service_get_state(priv->service);
+
+  g_debug("[%p] %s -> %s", self,
+	  connman_service_state2str(priv->state),
+	  connman_service_state2str(new_state));
 
   /* only show state transitions */
   if (priv->state == new_state)
     return;
 
-  /*
-   * if old state is unknown it means that we indicator-network-service just
-   * started, so we should not send any notifications
-   */
-  if (priv->state != SERVICE_STATE_UNKNOWN) {
-    switch (new_state) {
-    case SERVICE_STATE_READY:
-      if (g_str_equal(priv->type, CONNMAN_TECHNOLOGY_WIFI))
-	icon = ICON_NOTIFICATION_WIFI_FULL;
-      else if (g_str_equal(priv->type, CONNMAN_TECHNOLOGY_ETHERNET))
-	icon = ICON_NOTIFICATION_WIRED_CONNECTED;
-      else if (g_str_equal(priv->type, CONNMAN_TECHNOLOGY_CELLULAR))
-	icon = ICON_NOTIFICATION_CELLULAR_CONNECTED;
-      else
-	icon = NULL;
-      manager_notify(priv->network_service, priv->name,
-			     _("Connection Established"), icon);
-      break;
-    case SERVICE_STATE_IDLE:
-      icon = get_disconnected_icon(self);
-      manager_notify(priv->network_service, priv->name,
-			     _("Disconnected"), icon);
-      break;
-    case SERVICE_STATE_FAILURE:
-      icon = get_disconnected_icon(self);
-      manager_notify(priv->network_service, priv->name,
-			     _("Connection Failed"), icon);
-      break;
-    case SERVICE_STATE_ASSOCIATION:
-    case SERVICE_STATE_CONFIGURATION:
-    default:
-      /* do nothing */
-      break;
-    }
+  type = connman_service_get_service_type(priv->service);
+
+  switch (new_state) {
+  case CONNMAN_SERVICE_STATE_READY:
+    if (type == CONNMAN_SERVICE_TYPE_WIFI)
+      icon = ICON_NOTIFICATION_WIFI_FULL;
+    else if (type == CONNMAN_SERVICE_TYPE_ETHERNET)
+      icon = ICON_NOTIFICATION_WIRED_CONNECTED;
+    else if (type == CONNMAN_SERVICE_TYPE_CELLULAR)
+      icon = ICON_NOTIFICATION_CELLULAR_CONNECTED;
+    else
+      icon = NULL;
+    manager_notify(priv->network_service,
+		   connman_service_get_name(priv->service),
+		   _("Connection Established"), icon);
+    break;
+  case CONNMAN_SERVICE_STATE_IDLE:
+    icon = get_disconnected_icon(self);
+    manager_notify(priv->network_service,
+		   connman_service_get_name(priv->service),
+		   _("Disconnected"), icon);
+    break;
+  case CONNMAN_SERVICE_STATE_FAILURE:
+    icon = get_disconnected_icon(self);
+    manager_notify(priv->network_service,
+		   connman_service_get_name(priv->service),
+		   _("Connection Failed"), icon);
+    break;
+  case CONNMAN_SERVICE_STATE_ASSOCIATION:
+  case CONNMAN_SERVICE_STATE_CONFIGURATION:
+  default:
+    /* do nothing */
+    break;
   }
 
-  if ((priv->state == SERVICE_STATE_ASSOCIATION ||
-       priv->state == SERVICE_STATE_CONFIGURATION) &&
-      new_state == SERVICE_STATE_FAILURE) {
+  if ((priv->state == CONNMAN_SERVICE_STATE_ASSOCIATION ||
+       priv->state == CONNMAN_SERVICE_STATE_CONFIGURATION) &&
+      new_state == CONNMAN_SERVICE_STATE_FAILURE) {
     show_connect_error(self);
   }
 
@@ -513,73 +390,45 @@
   ServicePrivate *priv = GET_PRIVATE(self);
   const gchar *icon;
 
-  icon = manager_icon_name(priv->type, priv->signal_strength);
+  g_return_if_fail(priv != NULL);
+
+  icon = manager_icon_name(connman_service_get_service_type(priv->service),
+			   connman_service_get_strength(priv->service));
 
   dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self),
 				 DBUSMENU_MENUITEM_PROP_ICON_NAME,
 				 icon);
 }
 
-/* FIXME: this should get GValue, not gchar */
-static void service_update_type(Service *self, const gchar *type)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-
-  g_return_if_fail(priv);
-  g_return_if_fail(type);
-
-  g_free(priv->type);
-  priv->type = g_strdup(type);
-
-  g_debug("[%p] type %s", self, priv->type);
-
-  service_update_icon(self);
-}
-
-static void service_update_strength(Service *self, GValue *value)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-  guchar strength;
-
-  g_return_if_fail(priv);
-  g_return_if_fail(value);
-  g_return_if_fail(G_VALUE_HOLDS_UCHAR(value));
-
-  strength = g_value_get_uchar(value);
-
-  if (strength > 100)
-    return;
-
-  priv->signal_strength = strength;
+static void strength_updated(ConnmanService *service, GParamSpec *pspec,
+			 gpointer user_data)
+{
+  Service *self = SERVICE(user_data);
+
   service_update_icon(self);
 
   g_signal_emit(self, signals[STRENGTH_UPDATED], 0);
 }
 
-static void service_update_setup_required(Service *self, GValue *value)
+static void setup_required(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
-  gboolean setup;
+  ConnmanServiceType type;
   gchar *argv[3];
   gchar *cmd = BINDIR "/indicator-network-mobile-wizard";
 
   g_return_if_fail(priv);
-  g_return_if_fail(value);
-  g_return_if_fail(G_VALUE_HOLDS_BOOLEAN(value));
-
-  setup = g_value_get_boolean(value);
-
-  g_debug("[%p] setup required %d", self, setup);
+
+  g_debug("[%p] setup required", self);
+
+  type = connman_service_get_service_type(priv->service);
 
   /* mobile wizard is only for cellular */
-  if (g_strcmp0(priv->type, CONNMAN_TECHNOLOGY_CELLULAR) != 0)
-    return;
-
-  if (!setup)
+  if (type != CONNMAN_SERVICE_TYPE_CELLULAR)
     return;
 
   argv[0] = cmd;
-  argv[1] = priv->path;
+  argv[1] = g_strdup(connman_service_get_path(priv->service));
   argv[2] = 0;
 
   /*
@@ -588,224 +437,47 @@
    */
   g_debug("%s(): starting %s %s", __func__, argv[0], argv[1]);
   g_spawn_async(NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
-}
-
-static void service_update_security(Service *self, GValue *value)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-  gint mode;
-
-  g_return_if_fail(priv);
-  g_return_if_fail(value);
-  g_return_if_fail(G_VALUE_HOLDS_STRING(value));
-
-  g_free(priv->security);
-  priv->security = g_value_dup_string(value);
-
-  if (priv->security == NULL) {
-    g_warning("%s(): failed to allocate string for error", __func__);
-    return;
-  }
-
-  if ((g_strcmp0(priv->security, "wep") == 0) ||
-      (g_strcmp0(priv->security, "wpa") == 0) ||
-      (g_strcmp0(priv->security, "psk") == 0) ||
-      (g_strcmp0(priv->security, "rsn") == 0))
-    mode = SERVICE_MENUITEM_PROP_PROTECTED;
-  else
-    mode = SERVICE_MENUITEM_PROP_OPEN;
-
-  dbusmenu_menuitem_property_set_int(DBUSMENU_MENUITEM(self),
-				     SERVICE_MENUITEM_PROP_PROTECTION_MODE,
-				     mode);
-
-  g_debug("[%p] security %s", self, priv->security);
-}
-
-static void service_update_error(Service *self, GValue *value)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-
-  g_return_if_fail(priv);
-  g_return_if_fail(value);
-  g_return_if_fail(G_VALUE_HOLDS_STRING(value));
-
-  g_free(priv->error);
-  priv->error = g_value_dup_string(value);
-
-  if (priv->error == NULL) {
-    g_warning("%s(): failed to allocate string for error", __func__);
-    return;
-  }
-
-  g_debug("[%p] error '%s'", self, priv->error);
-}
-
-static void service_update_name(Service *self, GValue *value)
-{
+
+  g_free(argv[1]);
+}
+
+static void name_updated(ConnmanService *service, GParamSpec *pspec,
+			 gpointer user_data)
+{
+  Service *self = SERVICE(user_data);
   ServicePrivate *priv = GET_PRIVATE(self);
 
   g_return_if_fail(priv != NULL);
-  g_return_if_fail(priv->path != NULL);
-
-  g_free(priv->name);
-  priv->name = NULL;
-
-  if (value && !G_VALUE_HOLDS_STRING(value))
-    g_critical("%s(): value not a string", __func__);
-
-  if (value && G_VALUE_HOLDS_STRING(value) &&
-      strlen(g_value_get_string(value)) > 0)
-    priv->name = g_value_dup_string(value);
-  else
-    /* no valid name found for the service, use service path instead */
-    priv->name = g_strdup(priv->path);
-
-  g_debug("[%p] name %s", self, priv->name);
+
+  g_debug("[%p] name %s", self, connman_service_get_name(priv->service));
 
   service_update_label(self);
 }
 
-static void service_get_properties(Service *self)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-  GHashTable *properties = NULL;
-  GValue *value;
-  GError *error = NULL;
-
-  g_return_if_fail(priv);
-  g_return_if_fail(priv->proxy != NULL);
-
-  /* should this be async? */
-  org_moblin_connman_Service_get_properties(priv->proxy, &properties,
-					    &error);
-
-  if (error) {
-    g_warning("%s(): org_moblin_connman_Service_get_properties failed: %s",
-	      __func__, error->message);
-    g_error_free(error);
-    goto out;
-  }
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_NAME);
-  if (value)
-    service_update_name(self, value);
-
-  /* needs to be before service_update_state() */
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_TYPE);
-  if (value)
-    service_update_type(self, g_value_get_string(value));
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_STATE);
-  if (value)
-    service_update_state(self, g_value_get_string(value));
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_STRENGTH);
-  if (value)
-    service_update_strength(self, value);
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_SETUP_REQUIRED);
-  if (value)
-    service_update_setup_required(self, value);
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_SECURITY);
-  if (value)
-    service_update_security(self, value);
-
-  value = g_hash_table_lookup(properties, CONNMAN_PROPERTY_ERROR);
-  if (value)
-    service_update_error(self, value);
-
- out:
-  if (properties)
-    g_hash_table_destroy(properties);
-}
-
-static void service_property_changed(DBusGProxy *proxy, const gchar *property,
-				     GValue *value, gpointer user_data)
-{
-  Service *self = user_data;
-
-  if (g_str_equal(property, CONNMAN_PROPERTY_NAME)) {
-    service_update_name(self, value);
-  }
-
-  if (g_str_equal(property, CONNMAN_PROPERTY_STATE)) {
-    service_update_state(self, g_value_get_string(value));
-  }
-
-  if (g_str_equal(property, CONNMAN_PROPERTY_STRENGTH)) {
-    service_update_strength(self, value);
-  }
-
-  if (g_strcmp0(property, CONNMAN_PROPERTY_SETUP_REQUIRED) == 0) {
-    service_update_setup_required(self, value);
-  }
-
-  if (g_strcmp0(property, CONNMAN_PROPERTY_SECURITY) == 0) {
-    service_update_security(self, value);
-  }
-
-  if (g_strcmp0(property, CONNMAN_PROPERTY_ERROR) == 0) {
-    service_update_error(self, value);
-  }
-}
-
-Service *service_new(const gchar *path, Manager *ns)
+Service *service_new(ConnmanService *service, Manager *ns)
 {
   ServicePrivate *priv;
-  DBusGConnection *system_bus;
-  GError *error = NULL;
   Service *self;
+  gint mode;
+
+  g_return_val_if_fail(service != NULL, NULL);
+  g_return_val_if_fail(ns != NULL, NULL);
 
   self = g_object_new(TYPE_SERVICE, NULL);
   priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(self != NULL, NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
   priv->network_service = ns;
-
-  priv->path = g_strdup(path);
-  if (!priv->path) {
-    goto error;
-  }
-
-  g_debug("[%p] service new %s", self, priv->path);
-
-  priv->name = g_strdup(priv->path);
-
-  /*
-   * FIXME: set DBUSMENU_MENUITEM_PROP_LABEL to show at least something
-   * from the beginning, if nothing else than "<unnamed>"
-   */
-
-  system_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
-
-  /* FIXME: follow also destroy signal */
-  priv->proxy = dbus_g_proxy_new_for_name_owner(system_bus,
-						CONNMAN_SERVICE_NAME,
-						path,
-						CONNMAN_SERVICE_INTERFACE,
-						&error);
-  if (error != NULL) {
-    g_warning("failed to create dbus proxy for service %s", path);
-    goto error;
-  }
-
-  /*
-   * Some method calls, especially the connect method, might take a long
-   * time. I didn't find a way to change the timeout for specific calls, so
-   * have to increase timeout for all proxy calls.
-   */
-  dbus_g_proxy_set_default_timeout(priv->proxy, 120000);
-
-  dbus_g_proxy_add_signal(priv->proxy, CONNMAN_SIGNAL_PROPERTY_CHANGED,
-			  G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-
-  dbus_g_proxy_connect_signal(priv->proxy,
-			      CONNMAN_SIGNAL_PROPERTY_CHANGED,
-			      G_CALLBACK(service_property_changed),
-			      self, NULL);
-
-  priv->state = SERVICE_STATE_UNKNOWN;
+  g_object_ref(priv->network_service);
+
+  priv->service = service;
+  g_object_ref(priv->service);
+
+  /* FIXME: follow signals from priv->service */
+
+  g_debug("[%p] service new %s", self, connman_service_get_path(priv->service));
 
   dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self),
 				 DBUSMENU_MENUITEM_PROP_TYPE,
@@ -814,46 +486,82 @@
 				 DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,
 				 DBUSMENU_MENUITEM_TOGGLE_CHECK);
 
-  service_get_properties(self);
+  switch (connman_service_get_security(priv->service)) {
+  case CONNMAN_SERVICE_SECURITY_WEP:
+  case CONNMAN_SERVICE_SECURITY_PSK:
+  case CONNMAN_SERVICE_SECURITY_IEEE8021X:
+    mode = SERVICE_MENUITEM_PROP_PROTECTED;
+    break;
+  case CONNMAN_SERVICE_SECURITY_NONE:
+  default:
+    mode = SERVICE_MENUITEM_PROP_OPEN;
+    break;
+  }
+
+  dbusmenu_menuitem_property_set_int(DBUSMENU_MENUITEM(self),
+				     SERVICE_MENUITEM_PROP_PROTECTION_MODE,
+				     mode);
+
+  service_update_label(self);
+  service_update_checkmark(self);
 
   g_signal_connect(G_OBJECT(self),
 		   DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
 		   G_CALLBACK(service_item_activated), self);
 
+  g_signal_connect(priv->service, "notify::state", G_CALLBACK(state_updated),
+		   self);
+  g_signal_connect(priv->service, "notify::name", G_CALLBACK(name_updated),
+		   self);
+  g_signal_connect(priv->service, "notify::strength",
+		   G_CALLBACK(strength_updated),
+		   self);
+
+  if (connman_service_is_setup_required(priv->service))
+    setup_required(self);
+
   return self;
-
- error:
-  g_object_unref(self);
-  return NULL;
 }
 
 const gchar *service_get_path(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
 
-  return priv->path;
-}
-
-/* service_get_type() existed already, use "tech" instead */
-const gchar *service_get_tech(Service *self)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-
-  return priv->type;
-}
-
-ServiceState service_get_state(Service *self)
-{
-  ServicePrivate *priv = GET_PRIVATE(self);
-
-  return priv->state;
+  g_return_val_if_fail(IS_SERVICE(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
+  return connman_service_get_path(priv->service);
+}
+
+/* service_get_type() existed already, use "service_type" instead */
+ConnmanServiceType service_get_service_type(Service *self)
+{
+  ServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(IS_SERVICE(self), CONNMAN_SERVICE_TYPE_ETHERNET);
+  g_return_val_if_fail(priv != NULL, CONNMAN_SERVICE_TYPE_ETHERNET);
+
+  return connman_service_get_service_type(priv->service);
+}
+
+ConnmanServiceState service_get_state(Service *self)
+{
+  ServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(IS_SERVICE(self), CONNMAN_SERVICE_STATE_FAILURE);
+  g_return_val_if_fail(priv != NULL, CONNMAN_SERVICE_STATE_FAILURE);
+
+  return connman_service_get_state(priv->service);
 }
 
 gint service_get_strength(Service *self)
 {
   ServicePrivate *priv = GET_PRIVATE(self);
 
-  return priv->signal_strength;
+  g_return_val_if_fail(IS_SERVICE(self), 0);
+  g_return_val_if_fail(priv != NULL, 0);
+
+  return connman_service_get_strength(priv->service);
 }
 
 const gchar *service_get_name(Service *self)
@@ -863,5 +571,5 @@
   g_return_val_if_fail(IS_SERVICE(self), NULL);
   g_return_val_if_fail(priv != NULL, NULL);
 
-  return priv->name;
+  return connman_service_get_name(priv->service);
 }

=== modified file 'src/backend/service.h'
--- src/backend/service.h	2010-10-05 07:23:53 +0000
+++ src/backend/service.h	2010-11-26 12:12:27 +0000
@@ -28,18 +28,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum {
-  SERVICE_STATE_UNKNOWN,
-  SERVICE_STATE_IDLE,
-  SERVICE_STATE_FAILURE,
-  SERVICE_STATE_ASSOCIATION,
-  SERVICE_STATE_CONFIGURATION,
-  SERVICE_STATE_READY,
-  SERVICE_STATE_LOGIN,
-  SERVICE_STATE_ONLINE,
-  SERVICE_STATE_DISCONNECT,
-} ServiceState;
-
 #define TYPE_SERVICE service_get_type()
 
 #define SERVICE(obj) \
@@ -69,10 +57,10 @@
 
 GType service_get_type(void);
 
-Service *service_new(const gchar *path, Manager *ns);
+Service *service_new(ConnmanService *service, Manager *ns);
 const gchar *service_get_path(Service *self);
-const gchar *service_get_tech(Service *self);
-ServiceState service_get_state(Service *self);
+ConnmanServiceType service_get_service_type(Service *self);
+ConnmanServiceState service_get_state(Service *self);
 gint service_get_strength(Service *self);
 const gchar *service_get_name(Service *self);
 

=== added file 'src/backend/ui-proxy.c'
--- src/backend/ui-proxy.c	1970-01-01 00:00:00 +0000
+++ src/backend/ui-proxy.c	2010-11-26 12:12:27 +0000
@@ -0,0 +1,421 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ui-proxy.h"
+
+#include "indicator-network-agent-xml.h"
+#include "dbus-shared-names.h"
+
+G_DEFINE_TYPE(UIProxy, ui_proxy, G_TYPE_OBJECT)
+
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((o), TYPE_UI_PROXY, \
+			       UIProxyPrivate))
+
+typedef struct _UIProxyPrivate UIProxyPrivate;
+
+struct _UIProxyPrivate {
+  GDBusProxy *proxy;
+  guint watch_id;
+
+  gboolean connected;
+  gboolean start_requested;
+};
+
+enum
+{
+  /* reserved */
+  PROP_0,
+
+  PROP_CONNECTED,
+};
+
+static void call_cb(GObject *object, GAsyncResult *res, gpointer user_data)
+{
+  GDBusProxy *proxy = G_DBUS_PROXY(object);
+  UIProxy *self = UI_PROXY(user_data);
+  GError *error = NULL;
+  GVariant *result;
+
+  result = g_dbus_proxy_call_finish(proxy, res, &error);
+
+  if (error != NULL) {
+    g_warning("ui dbus call failed: %s", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  if (result == NULL)
+    return;
+
+  g_variant_unref(result);
+  g_object_unref(self);
+}
+
+void ui_proxy_start(UIProxy *self)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(IS_UI_PROXY(self));
+  g_return_if_fail(priv != NULL);
+
+  if (priv->proxy == NULL) {
+    /*
+     * The current way to create UIProxy object is racy because we don't
+     * signal when dbus is ready for use, so it can happen that gdbus proxy
+     * is not created when start is called. Postpone start to happen after
+     * the proxy is created.
+     */
+    priv->start_requested = TRUE;
+    return;
+  }
+
+  g_dbus_proxy_call(priv->proxy, "Start", NULL,
+  		    G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+  		    call_cb, g_object_ref(self));
+}
+
+void ui_proxy_stop(UIProxy *self)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(IS_UI_PROXY(self));
+  g_return_if_fail(priv != NULL);
+
+  if (!priv->connected) {
+    g_warning("Not connected to UI, cancelling Stop request");
+    return;
+  }
+
+  g_dbus_proxy_call(priv->proxy, "Stop", NULL,
+  		    G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+  		    call_cb, g_object_ref(self));
+}
+
+void ui_proxy_show_connect_error(UIProxy *self, const gchar *error_id)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(IS_UI_PROXY(self));
+  g_return_if_fail(priv != NULL);
+
+  if (!priv->connected) {
+    g_warning("Not connected to UI, cancelling ShowConnectError request");
+    return;
+  }
+
+  g_dbus_proxy_call(priv->proxy, "ShowConnectError", NULL,
+  		    G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+  		    call_cb, g_object_ref(self));
+}
+
+void ui_proxy_show_wireless_connect(UIProxy *self)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(IS_UI_PROXY(self));
+  g_return_if_fail(priv != NULL);
+
+  if (!priv->connected) {
+    g_warning("Not connected to UI, cancelling ShowWirelessConnect request");
+    return;
+  }
+
+  g_dbus_proxy_call(priv->proxy, "ShowWirelessConnect", NULL,
+  		    G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+  		    call_cb, g_object_ref(self));
+}
+
+void ui_proxy_set_debug(UIProxy *self, guint level)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+  GVariant *parameters;
+
+  g_return_if_fail(IS_UI_PROXY(self));
+  g_return_if_fail(priv != NULL);
+
+  if (!priv->connected) {
+    g_warning("Not connected to UI, cancelling SetDebug request");
+    return;
+  }
+
+  parameters = g_variant_new("(i)", level);
+
+  g_dbus_proxy_call(priv->proxy, "SetDebug", parameters,
+  		    G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+  		    call_cb, g_object_ref(self));
+}
+
+static void ask_pin_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;
+  GVariant *result;
+
+  result = 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;
+  }
+
+  g_simple_async_result_set_op_res_gpointer(simple, result,
+					    (GDestroyNotify) g_variant_unref);
+
+ out:
+  g_simple_async_result_complete(simple);
+  g_object_unref(simple);
+}
+
+void ui_proxy_ask_pin(UIProxy *self, const gchar *type,
+		      GCancellable *cancellable, GAsyncReadyCallback callback,
+		      gpointer user_data)
+{
+  GSimpleAsyncResult *simple;
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+  GVariant *parameters;
+
+  g_return_if_fail(IS_UI_PROXY(self));
+  g_return_if_fail(priv != NULL);
+
+  simple = g_simple_async_result_new(G_OBJECT(self), callback,
+                                      user_data, ui_proxy_ask_pin);
+
+  if (!priv->connected) {
+    g_simple_async_result_set_error(simple, 0, 0,
+				    "Not connected to UI, cancelling AskPin request");
+    return;
+  }
+
+  parameters = g_variant_new("(s)", type);
+
+  g_dbus_proxy_call(priv->proxy, "AskPin", parameters,
+  		    G_DBUS_CALL_FLAGS_NONE, -1, cancellable,
+  		    ask_pin_cb, simple);
+}
+
+gchar *ui_proxy_ask_pin_finish(UIProxy *self, GAsyncResult *res, GError **error)
+{
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(res);
+  gchar *pin = NULL;
+  GVariant *variant;
+
+  g_return_val_if_fail(IS_UI_PROXY(self), NULL);
+  g_return_val_if_fail(g_simple_async_result_get_source_tag(simple) ==
+		       ui_proxy_ask_pin, NULL);
+
+  if (g_simple_async_result_propagate_error(simple, error))
+    return NULL;
+
+  variant = g_simple_async_result_get_op_res_gpointer(simple);
+  g_variant_get(variant, "s", pin);
+
+  /* simple still owns variant and unrefs it automatically */
+
+  /* caller now owns pin */
+  return pin;
+}
+
+gboolean ui_proxy_is_connected(UIProxy *self)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(IS_UI_PROXY(self), FALSE);
+  g_return_val_if_fail(priv != NULL, FALSE);
+
+  return priv->connected;
+}
+
+static void service_appeared(GDBusConnection *connection, const gchar *name,
+			     const gchar *name_owner, gpointer user_data)
+{
+  UIProxy *self = UI_PROXY(user_data);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  if (priv->connected)
+    return;
+
+  priv->connected = TRUE;
+  g_object_notify(G_OBJECT(self), "connected");
+}
+
+
+static void service_vanished(GDBusConnection *connection, const gchar *name,
+			     gpointer user_data)
+{
+  UIProxy *self = UI_PROXY(user_data);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  if (!priv->connected)
+    return;
+
+  priv->connected = FALSE;
+  g_object_notify(G_OBJECT(self), "connected");
+}
+
+static void create_proxy_cb(GObject *source_object, GAsyncResult *res,
+			    gpointer user_data)
+{
+  UIProxy *self = UI_PROXY(user_data);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+  GDBusNodeInfo *node_info;
+  GDBusInterfaceInfo *info;
+  GError *error = NULL;
+
+  g_return_if_fail(priv != NULL);
+
+  priv->proxy = g_dbus_proxy_new_finish(res, &error);
+
+  if (error != NULL) {
+    g_warning("Failed to get proxy: %s", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  if (priv->proxy == NULL) {
+    g_warning("Failed to get proxy, but no errors");
+    return;
+  }
+
+  node_info = g_dbus_node_info_new_for_xml(indicator_network_agent_xml,
+					   NULL);
+  g_return_if_fail(node_info != NULL);
+
+  info = node_info->interfaces[0];
+  g_dbus_proxy_set_interface_info(priv->proxy, info);
+
+  priv->watch_id = g_bus_watch_name(G_BUS_TYPE_SESSION,
+				    INDICATOR_NETWORK_AGENT_NAME,
+				    G_BUS_NAME_WATCHER_FLAGS_NONE,
+				    service_appeared,
+				    service_vanished,
+				    self,
+				    NULL);
+
+
+  if (priv->start_requested) {
+    ui_proxy_start(self);
+    priv->start_requested = FALSE;
+  }
+}
+
+static void ui_proxy_set_property(GObject *object,
+					 guint property_id,
+					 const GValue *value,
+					 GParamSpec *pspec)
+{
+  UIProxy *self = UI_PROXY(object);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_CONNECTED:
+    priv->connected = g_value_get_boolean(value);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void ui_proxy_get_property(GObject *object, guint property_id,
+				       GValue *value, GParamSpec *pspec)
+{
+  UIProxy *self = UI_PROXY(object);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_CONNECTED:
+    g_value_set_boolean(value, priv->connected);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void ui_proxy_dispose(GObject *object)
+{
+  UIProxy *self = UI_PROXY(object);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  if (priv->proxy != NULL) {
+    g_object_unref(priv->proxy);
+    priv->proxy = NULL;
+  }
+
+  if (priv->watch_id != 0) {
+    g_bus_unwatch_name(priv->watch_id);
+    priv->watch_id = 0;
+  }
+
+  G_OBJECT_CLASS(ui_proxy_parent_class)->dispose(object);
+}
+
+static void ui_proxy_finalize(GObject *object)
+{
+  G_OBJECT_CLASS(ui_proxy_parent_class)->finalize(object);
+}
+
+static void ui_proxy_class_init(UIProxyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private(klass, sizeof(UIProxyPrivate));
+
+  gobject_class->dispose = ui_proxy_dispose;
+  gobject_class->finalize = ui_proxy_finalize;
+  gobject_class->set_property = ui_proxy_set_property;
+  gobject_class->get_property = ui_proxy_get_property;
+
+  pspec = g_param_spec_boolean("connected",
+			       "UiProxy's connected property",
+			       "Informs when object is connected for use",
+			       FALSE,
+			       G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_CONNECTED, pspec);
+}
+
+static void ui_proxy_init(UIProxy *self)
+{
+}
+
+UIProxy *ui_proxy_new(void)
+{
+  UIProxy *self;
+
+  self = g_object_new(TYPE_UI_PROXY, NULL);
+
+  g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, NULL,
+			   INDICATOR_NETWORK_AGENT_NAME,
+			   INDICATOR_NETWORK_AGENT_OBJECT,
+  			   INDICATOR_NETWORK_AGENT_INTERFACE,
+			   NULL, create_proxy_cb, self);
+
+  return self;
+}

=== added file 'src/backend/ui-proxy.h'
--- src/backend/ui-proxy.h	1970-01-01 00:00:00 +0000
+++ src/backend/ui-proxy.h	2010-11-26 12:12:27 +0000
@@ -0,0 +1,72 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _UI_PROXY_H_
+#define _UI_PROXY_H_
+
+#include <glib-object.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define TYPE_UI_PROXY ui_proxy_get_type()
+
+#define UI_PROXY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_UI_PROXY, \
+			      UIProxy))
+
+#define UI_PROXY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_UI_PROXY, \
+			   UIProxyClass))
+
+#define IS_UI_PROXY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), TYPE_UI_PROXY))
+
+#define IS_UI_PROXY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), TYPE_UI_PROXY))
+
+#define UI_PROXY_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), TYPE_UI_PROXY, \
+			     UIProxyClass))
+
+typedef struct {
+  GObject parent;
+} UIProxy;
+
+typedef struct {
+  GObjectClass parent_class;
+} UIProxyClass;
+
+GType ui_proxy_get_type(void);
+
+void ui_proxy_start(UIProxy *self);
+void ui_proxy_stop(UIProxy *self);
+void ui_proxy_show_connect_error(UIProxy *self, const gchar *error_id);
+void ui_proxy_show_wireless_connect(UIProxy *self);
+void ui_proxy_set_debug(UIProxy *self, guint level);
+void ui_proxy_ask_pin(UIProxy *self, const gchar *type,
+		      GCancellable *cancellable, GAsyncReadyCallback callback,
+		      gpointer user_data);
+gchar *ui_proxy_ask_pin_finish(UIProxy *self, GAsyncResult *res,
+			       GError **error);
+gboolean ui_proxy_is_connected(UIProxy *self);
+UIProxy *ui_proxy_new(void);
+
+#endif

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-11-18 11:23:15 +0000
+++ tests/Makefile.am	2010-11-26 12:12:27 +0000
@@ -42,9 +42,7 @@
 	$(top_srcdir)/src/backend/service-manager.c \
 	mock-manager.c \
 	mock-service.c \
-	mock-dbus-gproxy.h \
-	mock-dbus-gproxy.c \
-	mock-dbus-gtype-specialized.c
+	mock-connman-service.c
 
 TEST_PROGS += test-service
 test_service_SOURCES = \
@@ -52,11 +50,9 @@
 	$(top_srcdir)/src/backend/service.c \
 	mock-manager.c \
 	mock-service-manager.c \
-	mock-dbus-gproxy.h \
-	mock-dbus-gproxy.c \
 	mock-dbusmenu-menuitem.c \
-	mock-dbus-gtype-specialized.c \
-	connman-service-client.h
+	connman-service-client.h \
+	mock-connman-service.c
 
 TEST_PROGS += test-network-menu
 test_network_menu_SOURCES = \
@@ -66,9 +62,7 @@
 	mock-dbusmenu-menuitem.c \
 	mock-service-manager.c \
 	mock-dbusmenu-server.c \
-	mock-dbus-gproxy.h \
-	mock-dbus-gproxy.c \
-	mock-dbus-gtype-specialized.c \
+	mock-ui-proxy.c \
 	connman-manager-client.h \
 	indicator-network-agent-client.h
 
@@ -77,19 +71,19 @@
 	test-manager.c \
 	$(top_srcdir)/src/backend/manager.c \
 	mock-service-manager.c \
-	mock-dbus-gproxy.h \
-	mock-dbus-gproxy.c \
 	mock-service.c \
 	mock-network-menu.c \
 	mock-network-menu.h \
 	mock-manager-proxy.c \
-	mock-dbus-gobject.c \
 	connman-manager-client.h \
 	mock-log.c \
 	mock-notify-notification.c \
 	mock-dbusmenu-menuitem.c \
 	mock-ofono-manager.c \
-	mock-dbus-gtype-specialized.c
+	mock-ui-proxy.c \
+	mock-connman-manager.c \
+	mock-connman-manager.h \
+	mock-connman-service.c
 
 TEST_PROGS += test-manager-proxy
 test_manager_proxy_SOURCES = \

=== added file 'tests/mock-connman-manager.c'
--- tests/mock-connman-manager.c	1970-01-01 00:00:00 +0000
+++ tests/mock-connman-manager.c	2010-11-26 12:12:27 +0000
@@ -0,0 +1,194 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mock-connman-manager.h"
+
+#include "marshal.h"
+#include "connman-service.h"
+
+G_DEFINE_TYPE(ConnmanManager, connman_manager, G_TYPE_OBJECT)
+
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((o), CONNMAN_TYPE_MANAGER, \
+			       ConnmanManagerPrivate))
+
+typedef struct _ConnmanManagerPrivate ConnmanManagerPrivate;
+
+struct _ConnmanManagerPrivate {
+  gboolean connected;
+  gboolean initialised;
+};
+
+enum {
+  SERVICE_ADDED_SIGNAL,
+  SERVICE_REMOVED_SIGNAL,
+  LAST_SIGNAL,
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+enum
+{
+  /* reserved */
+  PROP_0,
+
+  PROP_CONNECTED,
+};
+
+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)
+{
+  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;
+}
+
+ConnmanService **connman_manager_get_services(ConnmanManager *self)
+{
+  return NULL;
+}
+
+static void set_property(GObject *object, guint property_id,
+			 const GValue *value, GParamSpec *pspec)
+{
+  ConnmanManager *self = CONNMAN_MANAGER(object);
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_CONNECTED:
+      priv->connected = g_value_get_boolean(value);
+      break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void get_property(GObject *object, guint property_id,
+			 GValue *value, GParamSpec *pspec)
+{
+  ConnmanManager *self = CONNMAN_MANAGER(object);
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  switch(property_id) {
+  case PROP_CONNECTED:
+    g_value_set_boolean(value, priv->connected);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void connman_manager_dispose(GObject *object)
+{
+  G_OBJECT_CLASS(connman_manager_parent_class)->dispose(object);
+}
+
+static void connman_manager_finalize(GObject *object)
+{
+  G_OBJECT_CLASS(connman_manager_parent_class)->finalize(object);
+}
+
+static void connman_manager_class_init(ConnmanManagerClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GParamSpec *pspec;
+  guint id;
+
+  g_type_class_add_private(klass, sizeof(ConnmanManagerPrivate));
+
+  gobject_class->dispose = connman_manager_dispose;
+  gobject_class->finalize = connman_manager_finalize;
+  gobject_class->set_property = set_property;
+  gobject_class->get_property = get_property;
+
+  id = g_signal_new("service-added",
+		    G_TYPE_FROM_CLASS(klass),
+		    G_SIGNAL_RUN_LAST,
+		    0, NULL, NULL,
+		    _marshal_VOID__BOXED,
+		    G_TYPE_NONE, 1, CONNMAN_TYPE_SERVICE);
+  signals[SERVICE_ADDED_SIGNAL] = id;
+
+  id = g_signal_new("service-removed",
+		    G_TYPE_FROM_CLASS(klass),
+		    G_SIGNAL_RUN_LAST,
+		    0, NULL, NULL,
+		    _marshal_VOID__STRING,
+		    G_TYPE_NONE, 1, G_TYPE_STRING);
+  signals[SERVICE_REMOVED_SIGNAL] = id;
+
+  pspec = g_param_spec_boolean("connected",
+			       "ConnmanManager's connected property",
+			       "Set connected state", FALSE,
+			       G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_CONNECTED, pspec);
+}
+
+static void connman_manager_init(ConnmanManager *self)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  priv->connected = FALSE;
+  priv->initialised = FALSE;
+}
+
+ConnmanManager *connman_manager_new(void)
+{
+  return g_object_new(CONNMAN_TYPE_MANAGER, NULL);
+}
+
+/* mock functions */
+void connman_manager_mock_set_connected(ConnmanManager *self,
+					gboolean connected)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(CONNMAN_IS_MANAGER(self));
+  g_return_if_fail(priv != NULL);
+
+  priv->connected = connected;
+  g_object_notify(G_OBJECT(self), "connected");
+}

=== added file 'tests/mock-connman-manager.h'
--- tests/mock-connman-manager.h	1970-01-01 00:00:00 +0000
+++ tests/mock-connman-manager.h	2010-11-26 12:12:27 +0000
@@ -0,0 +1,25 @@
+/*
+ * indicator-network - user interface for connman
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "connman-manager.h"
+
+void connman_manager_mock_set_connected(ConnmanManager *self,
+					gboolean connected);

=== added file 'tests/mock-connman-service.c'
--- tests/mock-connman-service.c	1970-01-01 00:00:00 +0000
+++ tests/mock-connman-service.c	2010-11-26 12:12:27 +0000
@@ -0,0 +1,558 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "connman-service.h"
+
+#include <glib/gi18n.h>
+
+#include "connman-service-xml.h"
+#include "connman.h"
+#include "marshal.h"
+
+G_DEFINE_TYPE(ConnmanService, connman_service, G_TYPE_OBJECT)
+
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((o), CONNMAN_TYPE_SERVICE, \
+			       ConnmanServicePrivate))
+
+typedef struct _ConnmanServicePrivate ConnmanServicePrivate;
+
+struct _ConnmanServicePrivate {
+  gchar *path;
+  gboolean ready;
+
+  /* connman service properties */
+  ConnmanServiceState state;
+  gchar *error;
+  gchar *name;
+  ConnmanServiceType type;
+  ConnmanServiceSecurity security;
+  guint8 strength;
+  gboolean setup_required;
+};
+
+enum
+{
+  /* reserved */
+  PROP_0,
+
+  PROP_PATH,
+  PROP_READY,
+
+  PROP_STATE,
+  PROP_ERROR,
+  PROP_NAME,
+  PROP_TYPE,
+  PROP_SECURITY,
+  PROP_STRENGTH,
+  PROP_SETUP_REQUIRED,
+};
+
+#define SERVICE_NAME_UNKNOWN "<unnamed>"
+
+struct service_state_string
+{
+  const gchar *str;
+  ConnmanServiceState state;
+};
+
+static const struct service_state_string service_state_map[] = {
+  { "idle",		CONNMAN_SERVICE_STATE_IDLE },
+  { "failure",		CONNMAN_SERVICE_STATE_FAILURE },
+  { "association",	CONNMAN_SERVICE_STATE_ASSOCIATION },
+  { "configuration",	CONNMAN_SERVICE_STATE_CONFIGURATION },
+  { "ready",		CONNMAN_SERVICE_STATE_READY },
+  { "login",		CONNMAN_SERVICE_STATE_LOGIN },
+  { "online",		CONNMAN_SERVICE_STATE_ONLINE },
+  { "disconnect",	CONNMAN_SERVICE_STATE_DISCONNECT },
+};
+
+struct service_security_string
+{
+  const gchar *str;
+  ConnmanServiceSecurity security;
+};
+
+static const struct service_security_string service_security_map[] = {
+  { "none",		CONNMAN_SERVICE_SECURITY_NONE },
+  { "wep",		CONNMAN_SERVICE_SECURITY_WEP },
+  { "psk",		CONNMAN_SERVICE_SECURITY_PSK },
+  { "wpa",		CONNMAN_SERVICE_SECURITY_PSK },
+  { "rsn",		CONNMAN_SERVICE_SECURITY_PSK },
+  { "ieee8021x",	CONNMAN_SERVICE_SECURITY_IEEE8021X },
+};
+
+struct service_type_string
+{
+  const gchar *str;
+  ConnmanServiceType type;
+};
+
+static const struct service_type_string service_type_map[] = {
+  { "ethernet",		CONNMAN_SERVICE_TYPE_ETHERNET },
+  { "wifi",		CONNMAN_SERVICE_TYPE_WIFI },
+  { "bluetooth",	CONNMAN_SERVICE_TYPE_BLUETOOTH },
+  { "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 },
+};
+
+void connman_service_connect(ConnmanService *self,
+			     GAsyncReadyCallback callback,
+			     gpointer user_data)
+{
+}
+
+void connman_service_connect_finish(ConnmanService *self,
+				    GAsyncResult *res,
+				    GError **error)
+{
+}
+
+void connman_service_disconnect(ConnmanService *self,
+				GAsyncReadyCallback callback,
+				gpointer user_data)
+{
+}
+
+void connman_service_disconnect_finish(ConnmanService *self,
+				       GAsyncResult *res,
+				       GError **error)
+{
+}
+
+ConnmanServiceState connman_service_get_state(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->state;
+}
+
+const gchar *connman_service_get_error(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->error;
+}
+
+const gchar *connman_service_get_name(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->name;
+}
+
+ConnmanServiceType connman_service_get_service_type(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->type;
+}
+
+ConnmanServiceSecurity connman_service_get_security(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->security;
+}
+
+guint8 connman_service_get_strength(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->strength;
+}
+
+gboolean connman_service_is_setup_required(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  return priv->setup_required;
+}
+
+const gchar *connman_service_get_path(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
+  return priv->path;
+}
+
+gboolean connman_service_is_ready(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), FALSE);
+  g_return_val_if_fail(priv != NULL, FALSE);
+
+  return priv->ready;
+}
+
+ConnmanServiceState connman_service_str2state(const gchar *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 (g_strcmp0(s->str, state) == 0)
+      return s->state;
+  }
+
+  g_warning("unknown service state %s", state);
+
+  return CONNMAN_SERVICE_STATE_IDLE;
+}
+
+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;
+
+  for (i = 0; i < G_N_ELEMENTS(service_type_map); i++) {
+    s = &service_type_map[i];
+    if (g_strcmp0(s->str, type) == 0)
+      return s->type;
+  }
+
+  g_warning("unknown service type %s", type);
+
+  return CONNMAN_SERVICE_TYPE_ETHERNET;
+}
+
+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;
+
+  for (i = 0; i < G_N_ELEMENTS(service_security_map); i++) {
+    s = &service_security_map[i];
+    if (g_strcmp0(s->str, security) == 0)
+      return s->security;
+  }
+
+  g_warning("unknown service security %s", security);
+
+  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 connman_service_set_property(GObject *object, guint property_id,
+					 const GValue *value,
+					 GParamSpec *pspec)
+{
+  ConnmanService *self = CONNMAN_SERVICE(object);
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_PATH:
+    g_free(priv->path);
+    priv->path = g_value_dup_string(value);
+    break;
+  case PROP_READY:
+    priv->ready = g_value_get_boolean(value);
+    break;
+  case PROP_STATE:
+    priv->state = g_value_get_uint(value);
+    break;
+  case PROP_ERROR:
+    g_free(priv->error);
+    priv->error = g_value_dup_string(value);
+    break;
+  case PROP_NAME:
+    g_free(priv->name);
+    priv->name = g_value_dup_string(value);
+    break;
+  case PROP_TYPE:
+    priv->type = g_value_get_uint(value);
+    break;
+  case PROP_SECURITY:
+    priv->security = g_value_get_uint(value);
+    break;
+  case PROP_STRENGTH:
+    priv->strength = g_value_get_uchar(value);
+    break;
+  case PROP_SETUP_REQUIRED:
+    priv->setup_required = g_value_get_boolean(value);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void connman_service_get_property(GObject *object, guint property_id,
+					 GValue *value, GParamSpec *pspec)
+{
+  ConnmanService *self = CONNMAN_SERVICE(object);
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_PATH:
+    g_value_set_string(value, priv->path);
+    break;
+  case PROP_READY:
+    g_value_set_boolean(value, priv->ready);
+    break;
+  case PROP_STATE:
+    g_value_set_uint(value, priv->state);
+    break;
+  case PROP_ERROR:
+    g_value_set_string(value, priv->error);
+    break;
+  case PROP_NAME:
+    g_value_set_string(value, priv->name);
+    break;
+  case PROP_TYPE:
+    g_value_set_uint(value, priv->type);
+    break;
+  case PROP_SECURITY:
+    g_value_set_uint(value, priv->security);
+    break;
+  case PROP_STRENGTH:
+    g_value_set_uchar(value, priv->strength);
+    break;
+  case PROP_SETUP_REQUIRED:
+    g_value_set_boolean(value, priv->setup_required);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void connman_service_dispose(GObject *object)
+{
+  ConnmanService *self = CONNMAN_SERVICE(object);
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  G_OBJECT_CLASS(connman_service_parent_class)->dispose(object);
+
+  if (priv->path != NULL) {
+    g_free(priv->path);
+    priv->path = NULL;
+  }
+
+  if (priv->error != NULL) {
+    g_free(priv->error);
+    priv->error = NULL;
+  }
+
+  if (priv->name != NULL) {
+    g_free(priv->name);
+    priv->name = NULL;
+  }
+}
+
+static void connman_service_finalize(GObject *object)
+{
+  G_OBJECT_CLASS(connman_service_parent_class)->finalize(object);
+}
+
+static void connman_service_class_init(ConnmanServiceClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private(klass, sizeof(ConnmanServicePrivate));
+
+  gobject_class->dispose = connman_service_dispose;
+  gobject_class->finalize = connman_service_finalize;
+  gobject_class->set_property = connman_service_set_property;
+  gobject_class->get_property = connman_service_get_property;
+
+  pspec = g_param_spec_string("path",
+			      "ConnmanService's DBus path",
+			      "Set DBus path for the service",
+			      NULL,
+			      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property(gobject_class, PROP_PATH, pspec);
+
+  pspec = g_param_spec_boolean("ready",
+			       "ConnmanService's ready property",
+			       "Informs when object is ready for use",
+			       FALSE,
+			       G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_READY, pspec);
+
+  pspec = g_param_spec_uint("state",
+			    "ConnmanService's state property",
+			    "The state of the service",
+			    0, G_MAXUINT,
+			    CONNMAN_SERVICE_STATE_IDLE,
+			    G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_STATE, pspec);
+
+  pspec = g_param_spec_string("error",
+			      "ConnmanService's error property",
+			      "Last error code",
+			      NULL,
+			      G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_ERROR, pspec);
+
+  pspec = g_param_spec_string("name",
+			      "ConnmanService's name property",
+			      "Name of the service",
+			      SERVICE_NAME_UNKNOWN,
+			      G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_NAME, pspec);
+
+  pspec = g_param_spec_uint("type",
+			    "ConnmanService's type property",
+			    "Type of the service",
+			    0, G_MAXUINT,
+			    CONNMAN_SERVICE_TYPE_ETHERNET,
+			    G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_TYPE, pspec);
+
+  pspec = g_param_spec_uint("security",
+			    "ConnmanService's security property",
+			    "Security type of the service",
+			    0, G_MAXUINT,
+			    CONNMAN_SERVICE_SECURITY_NONE,
+			    G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_SECURITY, pspec);
+
+  pspec = g_param_spec_uint("strength",
+			    "ConnmanService's strength property",
+			    "Current signal strength of the service",
+			    0, G_MAXUINT8,
+			    0,
+			    G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_SECURITY, pspec);
+
+  pspec = g_param_spec_boolean("setup-required",
+			       "ConnmanService's setup-required property",
+			       "Is user configuration needed, eg APN",
+			       FALSE,
+			       G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_SETUP_REQUIRED, pspec);
+}
+
+static void connman_service_init(ConnmanService *self)
+{
+}
+
+ConnmanService *connman_service_new(const gchar *path)
+{
+  ConnmanService *self;
+
+  g_return_val_if_fail(path != NULL, NULL);
+
+  self = g_object_new(CONNMAN_TYPE_SERVICE, "path", path, NULL);
+
+  return self;
+}

=== modified file 'tests/mock-manager.c'
--- tests/mock-manager.c	2010-11-05 12:49:36 +0000
+++ tests/mock-manager.c	2010-11-26 12:12:27 +0000
@@ -49,7 +49,7 @@
 struct service_state_string
 {
   const gchar *str;
-  ServiceState state;
+  ConnmanServiceState state;
 };
 
 static void manager_dispose(GObject *object)
@@ -89,7 +89,7 @@
 {
 }
 
-const gchar *manager_icon_name(const gchar *technology, gint signal)
+const gchar *manager_icon_name(ConnmanServiceType type, gint signal)
 {
   return ICON_CONNECTED_DEFAULT;
 }
@@ -107,12 +107,12 @@
 {
 }
 
-DBusGProxy *manager_get_agent(Manager *self)
+UIProxy *manager_get_ui(Manager *self)
 {
   return NULL;
 }
 
-DBusGProxy *manager_get_connman(Manager *self)
+ConnmanManager *manager_get_connman(Manager *self)
 {
   return NULL;
 }

=== modified file 'tests/mock-service-manager.c'
--- tests/mock-service-manager.c	2010-11-05 12:49:36 +0000
+++ tests/mock-service-manager.c	2010-11-26 12:12:27 +0000
@@ -111,7 +111,8 @@
 {
 }
 
-void service_manager_update(ServiceManager *self, GValue *value)
+void service_manager_update_services(ServiceManager *self,
+				     ConnmanService **services)
 {
 }
 
@@ -145,9 +146,9 @@
   return 0;
 }
 
-const gchar *service_manager_get_default_technology(ServiceManager *self)
+ConnmanServiceType service_manager_get_default_technology(ServiceManager *self)
 {
-  return NULL;
+  return CONNMAN_SERVICE_TYPE_ETHERNET;
 }
 
 Service *service_manager_get_default_service(ServiceManager *self)

=== modified file 'tests/mock-service.c'
--- tests/mock-service.c	2010-10-05 14:42:29 +0000
+++ tests/mock-service.c	2010-11-26 12:12:27 +0000
@@ -20,7 +20,7 @@
 
 #include "service.h"
 
-Service *service_new(const gchar *path, Manager *ns)
+Service *service_new(ConnmanService *service, Manager *ns)
 {
   return NULL;
 }
@@ -30,12 +30,12 @@
   return "";
 }
 
-const gchar *service_get_tech(Service *self)
+ConnmanServiceType service_get_service_type(Service *self)
 {
-  return "";
+  return CONNMAN_SERVICE_TYPE_ETHERNET;
 }
 
-ServiceState service_get_state(Service *self)
+ConnmanServiceState service_get_state(Service *self)
 {
   return 0;
 }

=== added file 'tests/mock-ui-proxy.c'
--- tests/mock-ui-proxy.c	1970-01-01 00:00:00 +0000
+++ tests/mock-ui-proxy.c	2010-11-26 12:12:27 +0000
@@ -0,0 +1,159 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ui-proxy.h"
+
+#include "indicator-network-agent-xml.h"
+#include "dbus-shared-names.h"
+
+G_DEFINE_TYPE(UIProxy, ui_proxy, G_TYPE_OBJECT)
+
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((o), TYPE_UI_PROXY, \
+			       UIProxyPrivate))
+
+typedef struct _UIProxyPrivate UIProxyPrivate;
+
+struct _UIProxyPrivate {
+  gboolean connected;
+};
+
+enum
+{
+  /* reserved */
+  PROP_0,
+
+  PROP_CONNECTED,
+};
+
+void ui_proxy_start(UIProxy *self)
+{
+}
+
+void ui_proxy_stop(UIProxy *self)
+{
+}
+
+void ui_proxy_show_connect_error(UIProxy *self, const gchar *error_id)
+{
+}
+
+void ui_proxy_show_wireless_connect(UIProxy *self)
+{
+}
+
+void ui_proxy_set_debug(UIProxy *self, guint level)
+{
+}
+
+void ui_proxy_ask_pin(UIProxy *self, const gchar *type,
+		      GCancellable *cancellable, GAsyncReadyCallback callback,
+		      gpointer user_data)
+{
+}
+
+gchar *ui_proxy_ask_pin_finish(UIProxy *self, GAsyncResult *res, GError **error)
+{
+  return "1234";
+}
+
+gboolean ui_proxy_is_connected(UIProxy *self)
+{
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  return priv->connected;
+}
+
+static void ui_proxy_set_property(GObject *object, guint property_id,
+				  const GValue *value, GParamSpec *pspec)
+{
+  UIProxy *self = UI_PROXY(object);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_CONNECTED:
+    priv->connected = g_value_get_boolean(value);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void ui_proxy_get_property(GObject *object, guint property_id,
+				  GValue *value, GParamSpec *pspec)
+{
+  UIProxy *self = UI_PROXY(object);
+  UIProxyPrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_CONNECTED:
+    g_value_set_boolean(value, priv->connected);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void ui_proxy_dispose(GObject *object)
+{
+  G_OBJECT_CLASS(ui_proxy_parent_class)->dispose(object);
+}
+
+static void ui_proxy_finalize(GObject *object)
+{
+  G_OBJECT_CLASS(ui_proxy_parent_class)->finalize(object);
+}
+
+static void ui_proxy_class_init(UIProxyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private(klass, sizeof(UIProxyPrivate));
+
+  gobject_class->dispose = ui_proxy_dispose;
+  gobject_class->finalize = ui_proxy_finalize;
+  gobject_class->set_property = ui_proxy_set_property;
+  gobject_class->get_property = ui_proxy_get_property;
+
+  pspec = g_param_spec_boolean("connected",
+			       "UiProxy's connected property",
+			       "Informs when object is connected for use",
+			       FALSE,
+			       G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_CONNECTED, pspec);
+}
+
+static void ui_proxy_init(UIProxy *self)
+{
+}
+
+UIProxy *ui_proxy_new(void)
+{
+  return  g_object_new(TYPE_UI_PROXY, NULL);
+}

=== modified file 'tests/test-manager.c'
--- tests/test-manager.c	2010-10-07 07:56:49 +0000
+++ tests/test-manager.c	2010-11-26 12:12:27 +0000
@@ -24,6 +24,7 @@
 #include "manager.h"
 #include "mock-dbus-gproxy.h"
 #include "mock-network-menu.h"
+#include "mock-connman-manager.h"
 
 #define DOMAIN "/Network/Backend/Manager"
 
@@ -32,12 +33,16 @@
 static void test_new(void)
 {
   DBusGConnection *fake_connection = (DBusGConnection *) 0x1;
+  ConnmanManager *connman;
   NetworkMenu *menu;
 
   sm = manager_new(fake_connection);
 
   g_assert(sm != NULL);
 
+  connman = manager_get_connman(sm);
+  connman_manager_mock_set_connected(connman, TRUE);
+
   while (g_main_context_iteration(NULL, FALSE));
 
   menu = network_menu_mock_get_object();
@@ -47,10 +52,11 @@
 
 static void test_destroyed_signal(void)
 {
-  DBusGProxy *proxy = dbus_g_proxy_mock_get_object();
+  ConnmanManager *connman;
   NetworkMenu *menu;
 
-  dbus_g_proxy_mock_emit_destroyed(proxy);
+  connman = manager_get_connman(sm);
+  connman_manager_mock_set_connected(connman, FALSE);
 
   while (g_main_context_iteration(NULL, FALSE));
 

=== modified file 'tests/test-network-menu.c'
--- tests/test-network-menu.c	2010-10-05 11:53:00 +0000
+++ tests/test-network-menu.c	2010-11-26 12:12:27 +0000
@@ -27,7 +27,7 @@
 
 /* stubs */
 
-Service *service_new(const gchar *path, Manager *ns)
+Service *service_new(ConnmanService *service, Manager *ns)
 {
   return NULL;
 }
@@ -37,12 +37,12 @@
   return "";
 }
 
-const gchar *service_get_tech(Service *self)
+ConnmanServiceType service_get_service_type(Service *self)
 {
-  return "";
+  return CONNMAN_SERVICE_TYPE_ETHERNET;
 }
 
-ServiceState service_get_state(Service *self)
+ConnmanServiceState service_get_state(Service *self)
 {
   return 0;
 }
@@ -52,12 +52,6 @@
   return 0;
 }
 
-void dbus_g_type_collection_value_iterate(const GValue *value,
-					  DBusGTypeSpecializedCollectionIterator iterator,
-					  gpointer user_data)
-{
-}
-
 /* tests */
 
 static NetworkMenu *menu;

=== modified file 'tests/test-service-manager.c'
--- tests/test-service-manager.c	2010-10-05 14:42:29 +0000
+++ tests/test-service-manager.c	2010-11-26 12:12:27 +0000
@@ -49,7 +49,6 @@
 {
   g_assert_cmpuint(service_manager_get_strength(sm), ==, 0);
   g_assert(service_manager_get_default_service(sm) == NULL);
-  g_assert_cmpstr(service_manager_get_default_technology(sm), ==, "");
   g_assert(service_manager_get_connected(sm) == FALSE);
   g_assert(service_manager_is_connecting(sm) == FALSE);
 

=== modified file 'tests/test-service.c'
--- tests/test-service.c	2010-10-05 11:41:18 +0000
+++ tests/test-service.c	2010-11-26 12:12:27 +0000
@@ -37,7 +37,10 @@
 
 static void test_new()
 {
-  service = service_new(SERVICE_PATH_FOO, NULL);
+  ConnmanService *cs = connman_service_new("/foo");
+  Manager *m = manager_new(NULL);
+
+  service = service_new(cs, m);
 
   g_assert(service != NULL);
   g_assert(IS_SERVICE(service));
@@ -45,22 +48,6 @@
   g_assert_cmpstr(service_get_path(service), ==, SERVICE_PATH_FOO);
 }
 
-static void test_name_update()
-{
-  DBusGProxy *proxy;
-  GValue v = { 0 };
-
-  proxy = dbus_g_proxy_mock_get_object();
-  g_assert(proxy != NULL);
-
-  g_value_init(&v, G_TYPE_STRING);
-  g_value_set_string(&v, SERVICE_NAME_FOOBAR);
-
-  dbus_g_proxy_mock_emit_property_changed(proxy, CONNMAN_PROPERTY_NAME, &v);
-
-  g_assert_cmpstr(service_get_name(service), ==, SERVICE_NAME_FOOBAR);
-}
-
 gint main (gint argc, gchar *argv[])
 {
   g_type_init();
@@ -68,7 +55,6 @@
   g_test_init(&argc, &argv, NULL);
 
   g_test_add_func(DOMAIN "/New", test_new);
-  g_test_add_func(DOMAIN "/NameUpdate", test_name_update);
 
   return g_test_run();
 }