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

[Kalle Valo]

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/backend/manager.c'
--- src/backend/manager.c	2011-03-08 08:55:57 +0000
+++ src/backend/manager.c	2011-03-08 16:24:11 +0000
@@ -518,13 +518,6 @@
   g_signal_connect(priv->connman, "notify::default-service",
 		   G_CALLBACK(default_service_notify),
 		   self);
-
-  if (connman_manager_get_connected(priv->connman))
-    connman_connected(self);
-
-  /* otherwise wait for the connected signal */
-
-  return;
 }
 
 static void ui_connected_notify(UIProxy *ui, GParamSpec *pspec,
@@ -635,6 +628,8 @@
   self = g_object_new(TYPE_MANAGER, NULL);
   priv = GET_PRIVATE(self);
 
+  create_connman(self);
+
   priv->ns_dbus = manager_proxy_new(self);
   priv->service_manager = service_manager_new(self);
   priv->network_menu = network_menu_new(self);
@@ -645,7 +640,6 @@
 		   G_CALLBACK(strength_updated), self);
 
   create_ui_proxy(self);
-  create_connman(self);
 
   /* create icon names */
   for (i = 0; i < CONNECTING_ICON_STAGES; i++) {
@@ -659,5 +653,10 @@
 
   priv->ofono_manager = ofono_manager_new(self);
 
+  if (connman_manager_get_connected(priv->connman))
+    connman_connected(self);
+
+  /* otherwise wait for the connected signal */
+
   return self;
 }

=== modified file 'src/backend/network-menu.c'
--- src/backend/network-menu.c	2010-11-30 12:38:55 +0000
+++ src/backend/network-menu.c	2011-03-08 16:24:11 +0000
@@ -30,6 +30,7 @@
 #include "dbus-shared-names.h"
 #include "connman.h"
 #include "manager.h"
+#include "connman-manager.h"
 
 G_DEFINE_TYPE (NetworkMenu, network_menu, DBUSMENU_TYPE_MENUITEM)
 
@@ -67,11 +68,22 @@
   gboolean menu_enabled;
 
   Manager *network_service;
+  ConnmanManager *connman;
 };
 
 static void
 network_menu_dispose (GObject *object)
 {
+  NetworkMenu *self = NETWORK_MENU(object);
+  NetworkMenuPrivate *priv = GET_PRIVATE(self);
+
+ /* FIXME: unref all objects from NetworkMenuPrivate */
+
+  if (priv->connman != NULL) {
+    g_object_unref(priv->connman);
+    priv->connman = NULL;
+  }
+
   G_OBJECT_CLASS (network_menu_parent_class)->dispose (object);
 }
 
@@ -398,41 +410,62 @@
   
 }
 
-static void tech_state_changed(Manager *manager, const gchar *tech,
-			       gboolean state, gpointer user_data)
+static void wifi_state_changed(ConnmanManager *connman, GParamSpec *pspec,
+			       gpointer user_data)
 {
   NetworkMenu *self = NETWORK_MENU(user_data);
   NetworkMenuPrivate *priv = GET_PRIVATE(self);
   const gchar *str;
+  ConnmanTechnologyState state;
 
   g_return_if_fail(IS_NETWORK_MENU(self));
   g_return_if_fail(priv != NULL);
   g_return_if_fail(priv->wireless_header != NULL);
 
-  if (g_strcmp0(tech, CONNMAN_TECHNOLOGY_WIFI) != 0 )
-    return;
+  state = connman_manager_get_wifi_state(priv->connman);
 
-  if (state)
+  switch (state) {
+  case CONNMAN_TECHNOLOGY_STATE_ENABLED:
+  case CONNMAN_TECHNOLOGY_STATE_CONNECTED:
     str = _("Wi-Fi: ON");
-  else
+    priv->wireless_enabled = TRUE;
+    break;
+  case CONNMAN_TECHNOLOGY_STATE_UNKNOWN:
+  case CONNMAN_TECHNOLOGY_STATE_UNAVAILABLE:
+  case CONNMAN_TECHNOLOGY_STATE_AVAILABLE:
+  case CONNMAN_TECHNOLOGY_STATE_OFFLINE:
+  default:
     str = _("Wi-Fi: OFF");
+    priv->wireless_enabled = FALSE;
+    break;
+  }
 
   dbusmenu_menuitem_property_set(priv->wireless_header,
 				 DBUSMENU_MENUITEM_PROP_LABEL,
 				 str);
-  priv->wireless_enabled = state;
 }
 
 static void toggle_wireless_cb(DbusmenuMenuitem *mi, guint timestamp,
 			       gpointer user_data)
 {
-  NetworkMenu *self = user_data;
+  NetworkMenu *self = NETWORK_MENU(user_data);
   NetworkMenuPrivate *priv = GET_PRIVATE(self);
-  Manager *ns = priv->network_service;
-
-  g_return_if_fail(ns != NULL);
-
-  /* FIXME: enable or disable wireless accordingly */
+
+  g_return_if_fail(priv != NULL);
+  g_return_if_fail(priv->connman != NULL);
+
+  if (priv->wireless_enabled)
+    connman_manager_disable_technology(priv->connman,
+				       CONNMAN_TECHNOLOGY_TYPE_WIFI,
+				       NULL,
+				       NULL,
+				       NULL);
+  else
+    connman_manager_enable_technology(priv->connman,
+				      CONNMAN_TECHNOLOGY_TYPE_WIFI,
+				      NULL,
+				      NULL,
+				      NULL);
 }
 
 static void network_settings_activated(DbusmenuMenuitem *mi, guint timestamp,
@@ -474,6 +507,8 @@
   priv = GET_PRIVATE(self);
 
   priv->network_service = ns;
+  g_return_val_if_fail(manager_get_connman(ns) != NULL, NULL);
+  priv->connman = g_object_ref(manager_get_connman(ns));
 
   sm = manager_get_service_manager(ns);
   g_signal_connect(G_OBJECT(sm), "services-updated",
@@ -481,8 +516,8 @@
   g_signal_connect(G_OBJECT(sm), "state-changed",
 		   G_CALLBACK(connect_state_changed), self);
 
-  g_signal_connect(G_OBJECT(ns), "technology-state-changed",
-		   G_CALLBACK(tech_state_changed), self);
+  g_signal_connect(G_OBJECT(priv->connman), "notify::wifi-state",
+		   G_CALLBACK(wifi_state_changed), self);
 
   server = dbusmenu_server_new(INDICATOR_NETWORK_DBUS_OBJECT);
   dbusmenu_server_set_root(server, DBUSMENU_MENUITEM(self));

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2011-01-25 08:09:27 +0000
+++ tests/Makefile.am	2011-03-08 16:24:11 +0000
@@ -44,6 +44,8 @@
 	$(top_srcdir)/src/backend/service-manager.c \
 	mock-manager.c \
 	mock-service.c \
+	mock-connman-manager.c \
+	mock-connman-manager.h \
 	mock-connman-service.c
 
 TEST_PROGS += test-service
@@ -53,6 +55,8 @@
 	mock-manager.c \
 	mock-service-manager.c \
 	mock-dbusmenu-menuitem.c \
+	mock-connman-manager.c \
+	mock-connman-manager.h \
 	mock-connman-service.c
 
 TEST_PROGS += test-network-menu
@@ -63,7 +67,10 @@
 	mock-dbusmenu-menuitem.c \
 	mock-service-manager.c \
 	mock-dbusmenu-server.c \
-	mock-ui-proxy.c
+	mock-ui-proxy.c \
+	mock-connman-manager.c \
+	mock-connman-manager.h \
+	mock-connman-service.c
 
 TEST_PROGS += test-manager
 test_manager_SOURCES = \

=== modified file 'tests/mock-connman-manager.c'
--- tests/mock-connman-manager.c	2011-01-12 22:53:21 +0000
+++ tests/mock-connman-manager.c	2011-03-08 16:24:11 +0000
@@ -52,6 +52,39 @@
   PROP_CONNECTED,
 };
 
+ConnmanTechnologyState connman_manager_get_wifi_state(ConnmanManager *self)
+{
+  return CONNMAN_TECHNOLOGY_STATE_ENABLED;
+}
+
+void connman_manager_enable_technology(ConnmanManager *self,
+				       ConnmanTechnologyType type,
+				       GCancellable *cancellable,
+				       GAsyncReadyCallback callback,
+				       gpointer user_data)
+{
+}
+
+void connman_manager_enable_technology_finish(ConnmanManager *self,
+					      GAsyncResult *res,
+					      GError **error)
+{
+}
+
+void connman_manager_disable_technology(ConnmanManager *self,
+					ConnmanTechnologyType type,
+					GCancellable *cancellable,
+					GAsyncReadyCallback callback,
+					gpointer user_data)
+{
+}
+
+void connman_manager_disable_technology_finish(ConnmanManager *self,
+					       GAsyncResult *res,
+					       GError **error)
+{
+}
+
 void connman_manager_connect_service(ConnmanManager *self,
 				     ConnmanServiceType type,
 				     ConnmanServiceMode mode,

=== modified file 'tests/mock-manager.c'
--- tests/mock-manager.c	2010-11-25 15:12:47 +0000
+++ tests/mock-manager.c	2011-03-08 16:24:11 +0000
@@ -36,6 +36,7 @@
 
 struct _ManagerPrivate {
   ServiceManager *sm;
+  ConnmanManager *connman;
 };
 
 enum {
@@ -54,6 +55,14 @@
 
 static void manager_dispose(GObject *object)
 {
+  Manager *self = MANAGER(object);
+  ManagerPrivate *priv = GET_PRIVATE(self);
+
+  if (priv->connman != NULL) {
+    g_object_unref(priv->connman);
+    priv->connman = NULL;
+  }
+
   G_OBJECT_CLASS(manager_parent_class)->dispose(object);
 }
 
@@ -114,7 +123,9 @@
 
 ConnmanManager *manager_get_connman(Manager *self)
 {
-  return NULL;
+  ManagerPrivate *priv = GET_PRIVATE(self);
+
+  return priv->connman;
 }
 
 ServiceManager *manager_get_service_manager(Manager *self)
@@ -134,6 +145,7 @@
   priv = GET_PRIVATE(self);
 
   priv->sm = service_manager_new(self);
+  priv->connman = connman_manager_new();
 
   return self;
 }