Merge lp:~kvalo/indicator-network/indicator-name-owner into lp:indicator-network/0.2

[Kalle Valo]

[David Barth (dbarth)]

Sounds fine in this case, as you're monitoring the network service, and not connman itself. I can confirm that the indicator is indeed updated across service restarts with this change.

review: Approve

=== modified file 'src/indicator-network.c'
--- src/indicator-network.c	2010-08-04 10:24:51 +0000
+++ src/indicator-network.c	2010-09-09 16:33:49 +0000
@@ -148,23 +148,19 @@
 {
   g_return_val_if_fail (IS_INDICATOR_NETWORK (self), NULL);
 
-  GError *error = NULL;
   DBusGConnection *bus;
 
   if (self->network_dbus_proxy != NULL)
     return self->network_dbus_proxy;
 
   bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-  self->network_dbus_proxy = dbus_g_proxy_new_for_name_owner(bus,
-							     INDICATOR_NETWORK_DBUS_NAME,
-							     INDICATOR_NETWORK_SERVICE_DBUS_OBJECT,
-							     INDICATOR_NETWORK_SERVICE_DBUS_INTERFACE,
-							     &error);
+  self->network_dbus_proxy = dbus_g_proxy_new_for_name(bus,
+						       INDICATOR_NETWORK_DBUS_NAME,
+						       INDICATOR_NETWORK_SERVICE_DBUS_OBJECT,
+						       INDICATOR_NETWORK_SERVICE_DBUS_INTERFACE);
 
-  if (error != NULL) {
-    g_warning("Unable to get network dbus proxy: %s", error->message);
-    g_error_free(error);
-	self->network_dbus_proxy = NULL;
+  if (self->network_dbus_proxy == NULL) {
+    g_warning("Unable to get network dbus proxy");
     return NULL;
   }