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

[Kalle Valo]

[Cody Russell (bratsche)]

review: Approve

=== modified file 'src/backend/manager.c'
--- src/backend/manager.c	2010-12-03 09:44:18 +0000
+++ src/backend/manager.c	2010-12-09 18:52:28 +0000
@@ -86,6 +86,7 @@
   ServiceManager *service_manager;
 
   ConnmanManager *connman;
+  ConnmanService *default_service;
 
   UIProxy *ui;
 
@@ -322,7 +323,12 @@
     goto done;
   }
 
-  type = service_manager_get_default_technology(priv->service_manager);
+  if (priv->default_service == NULL) {
+    icon_name = ICON_DISCONNECTED;
+    goto done;
+  }
+
+  type = connman_service_get_service_type(priv->default_service);
 
   icon_name = manager_icon_name(type, priv->signal_strength);
 
@@ -341,24 +347,30 @@
   update_icon(self);
 }
 
-static void default_service_changed(Manager *self)
+static void update_default_service(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
-  Service *service;
 
   g_return_if_fail(self != NULL);
   g_return_if_fail(priv != NULL);
 
-  service = service_manager_get_default_service(priv->service_manager);
-  if (service == NULL)
+  if (priv->default_service != NULL)
+    g_object_unref(priv->default_service);
+
+  priv->default_service = connman_manager_get_default_service(priv->connman);
+
+  if (priv->default_service == NULL)
     goto done;
 
-  priv->signal_strength = service_get_strength(service);
+  g_object_ref(priv->default_service);
+
+  priv->signal_strength = connman_service_get_strength(priv->default_service);
 
  done:
   update_icon(self);
 }
 
+/* FIXME: should follow priv->default_service strength */
 static void strength_updated(ServiceManager *sm, guint strength,
 			     gpointer user_data)
 {
@@ -375,12 +387,8 @@
 {
   Manager *self = MANAGER(user_data);
   ManagerPrivate *priv = GET_PRIVATE(self);
-  ConnmanService *cs;
-
-  cs = connman_manager_get_default_service(priv->connman);
-  service_manager_update_default_service(priv->service_manager, cs);
-
-  default_service_changed(self);
+
+  update_default_service(self);
 }
 
 static void update_services(Manager *self)
@@ -424,6 +432,8 @@
 
   update_services(self);
 
+  update_default_service(self);
+
   /* FIXME: create update_technologies() */
 
   network_menu_enable(priv->network_menu);

=== modified file 'src/backend/service-manager.c'
--- src/backend/service-manager.c	2010-12-03 11:55:51 +0000
+++ src/backend/service-manager.c	2010-12-09 18:52:28 +0000
@@ -37,7 +37,6 @@
 
 struct _ServiceManagerPrivate {
   GList *services;
-  Service *default_service;
   Manager *network_service;
 };
 
@@ -45,7 +44,6 @@
   STATE_CHANGED,
   STRENGTH_UPDATED,
   SERVICES_UPDATED,
-  DEFAULT_SERVICE_CHANGED,
   LAST_SIGNAL,
 };
 
@@ -99,13 +97,6 @@
 					   0, NULL, NULL,
 					   _marshal_VOID__VOID,
 					   G_TYPE_NONE, 0);
-
-  signals[DEFAULT_SERVICE_CHANGED] = g_signal_new("default-service-changed",
-					   G_TYPE_FROM_CLASS(klass),
-					   G_SIGNAL_RUN_LAST,
-					   0, NULL, NULL,
-					   _marshal_VOID__VOID,
-					   G_TYPE_NONE, 0);
 }
 
 static void service_manager_init(ServiceManager *self)
@@ -442,67 +433,3 @@
 
   return result;
 }
-
-ConnmanServiceType service_manager_get_default_technology(ServiceManager *self)
-{
-  Service *service;
-
-  g_return_val_if_fail(IS_SERVICE_MANAGER(self), CONNMAN_SERVICE_TYPE_ETHERNET);
-
-  service = service_manager_get_default_service(self);
-
-  if (service == NULL)
-    return CONNMAN_SERVICE_TYPE_ETHERNET;
-
-  return service_get_service_type(service);
-}
-
-Service *service_manager_get_default_service(ServiceManager *self)
-{
-  ServiceManagerPrivate *priv = GET_PRIVATE(self);
-
-  g_return_val_if_fail(IS_SERVICE_MANAGER(self), NULL);
-  g_return_val_if_fail(priv != NULL, NULL);
-
-  return priv->default_service;
-}
-
-void service_manager_update_default_service(ServiceManager *self,
-					    ConnmanService *cs)
-{
-  ServiceManagerPrivate *priv = GET_PRIVATE(self);
-  GList *l;
-
-  g_return_if_fail(IS_SERVICE_MANAGER(self));
-  g_return_if_fail(priv != NULL);
-
-  if (cs == NULL) {
-    priv->default_service = NULL;
-    goto out;
-  }
-
-  l = service_manager_find(priv->services, connman_service_get_path(cs));
-  if (l == NULL) {
-    priv->default_service = NULL;
-    goto out;
-  }
-
-  priv->default_service = l->data;
-
- out:
-  g_signal_emit(self, signals[DEFAULT_SERVICE_CHANGED], 0);
-}
-
-guint service_manager_get_strength(ServiceManager *self)
-{
-  ServiceManagerPrivate *priv = GET_PRIVATE(self);
-
-  g_return_val_if_fail(IS_SERVICE_MANAGER(self), 0);
-  g_return_val_if_fail(priv != NULL, 0);
-
-  if (priv->default_service == NULL)
-    return 0;
-
-  return service_get_strength(priv->default_service);
-}
-

=== modified file 'src/backend/service-manager.h'
--- src/backend/service-manager.h	2010-12-03 09:39:02 +0000
+++ src/backend/service-manager.h	2010-12-09 18:52:28 +0000
@@ -70,11 +70,6 @@
 gboolean service_manager_is_connecting(ServiceManager *self);
 gboolean service_manager_is_connected(ServiceManager *self);
 guint service_manager_get_connected(ServiceManager *self);
-ConnmanServiceType service_manager_get_default_technology(ServiceManager *self);
-void service_manager_update_default_service(ServiceManager *self,
-					    ConnmanService *cs);
-Service *service_manager_get_default_service(ServiceManager *self);
-guint service_manager_get_strength(ServiceManager *self);
 
 G_END_DECLS
 

=== modified file 'tests/mock-service-manager.c'
--- tests/mock-service-manager.c	2010-12-03 09:40:39 +0000
+++ tests/mock-service-manager.c	2010-12-09 18:52:28 +0000
@@ -145,23 +145,3 @@
 {
   return 0;
 }
-
-ConnmanServiceType service_manager_get_default_technology(ServiceManager *self)
-{
-  return CONNMAN_SERVICE_TYPE_ETHERNET;
-}
-
-Service *service_manager_get_default_service(ServiceManager *self)
-{
-  return NULL;
-}
-
-guint service_manager_get_strength(ServiceManager *self)
-{
-  return 0;
-}
-
-void service_manager_update_default_service(ServiceManager *self,
-					    ConnmanService *cs)
-{
-}

=== modified file 'tests/test-service-manager.c'
--- tests/test-service-manager.c	2010-11-25 15:12:47 +0000
+++ tests/test-service-manager.c	2010-12-09 18:52:28 +0000
@@ -39,8 +39,6 @@
 /* test all the functions before the object has any services */
 static void test_empty(void)
 {
-  g_assert_cmpuint(service_manager_get_strength(sm), ==, 0);
-  g_assert(service_manager_get_default_service(sm) == NULL);
   g_assert(service_manager_get_connected(sm) == FALSE);
   g_assert(service_manager_is_connecting(sm) == FALSE);