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

[Kalle Valo]

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/backend/service-manager.c'
--- src/backend/service-manager.c	2010-12-03 09:39:02 +0000
+++ src/backend/service-manager.c	2010-12-03 11:58:18 +0000
@@ -160,11 +160,130 @@
   priv->services = NULL;
 }
 
+/*
+ * Beginnings of proper sorting of services. Needs a lot more work, for example
+ * need to give more priority for favourite services
+ */
+static gint cmp_services(gconstpointer a, gconstpointer b)
+{
+  Service *a_service, *b_service;
+  ConnmanServiceType a_type, b_type;
+  gboolean a_connected, b_connected;
+  guint a_strength, b_strength;
+
+  a_service = SERVICE(a);
+  b_service = SERVICE(b);
+
+  a_type = service_get_service_type(a_service);
+  b_type = service_get_service_type(b_service);
+
+  if (service_get_state(a_service) == CONNMAN_SERVICE_STATE_READY ||
+      service_get_state(a_service) == CONNMAN_SERVICE_STATE_ONLINE)
+    a_connected = TRUE;
+  else
+    a_connected = FALSE;
+
+  if (service_get_state(b_service) == CONNMAN_SERVICE_STATE_READY ||
+      service_get_state(b_service) == CONNMAN_SERVICE_STATE_ONLINE)
+    b_connected = TRUE;
+  else
+    b_connected = FALSE;
+
+  a_strength = service_get_strength(a_service);
+  b_strength = service_get_strength(b_service);
+
+  /* ethernet */
+
+  if (a_type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+      b_type == CONNMAN_SERVICE_TYPE_ETHERNET)
+    return 0;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+      b_type == CONNMAN_SERVICE_TYPE_WIFI)
+    return -1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+      b_type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+    return -1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+      b_type == CONNMAN_SERVICE_TYPE_CELLULAR)
+    return -1;
+
+  /* wifi */
+
+  if (a_type == CONNMAN_SERVICE_TYPE_WIFI &&
+      b_type == CONNMAN_SERVICE_TYPE_ETHERNET)
+    return 1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_WIFI &&
+      b_type == CONNMAN_SERVICE_TYPE_WIFI) {
+    if (a_connected && !b_connected)
+      return -1;
+    else if (!a_connected && b_connected)
+      return 1;
+    else
+      return b_strength - a_strength;
+  }
+
+  if (a_type == CONNMAN_SERVICE_TYPE_WIFI &&
+      b_type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+    return -1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_WIFI &&
+      b_type == CONNMAN_SERVICE_TYPE_CELLULAR)
+    return -1;
+
+  /* bluetooth */
+
+  if (a_type == CONNMAN_SERVICE_TYPE_BLUETOOTH &&
+      b_type == CONNMAN_SERVICE_TYPE_ETHERNET)
+    return 1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_BLUETOOTH &&
+      b_type == CONNMAN_SERVICE_TYPE_WIFI)
+    return 1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_BLUETOOTH &&
+      b_type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+    return 0;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_BLUETOOTH &&
+      b_type == CONNMAN_SERVICE_TYPE_CELLULAR)
+    return 1;
+
+  /* cellular */
+
+  if (a_type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+      b_type == CONNMAN_SERVICE_TYPE_ETHERNET)
+    return 1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+      b_type == CONNMAN_SERVICE_TYPE_WIFI)
+    return 1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+      b_type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+    return -1;
+
+  if (a_type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+      b_type == CONNMAN_SERVICE_TYPE_CELLULAR)
+    return b_strength - a_strength;
+
+  return 0;
+}
+
 static void service_state_changed(Service *service, gpointer user_data)
 {
   ServiceManager *self = SERVICE_MANAGER(user_data);
+  ServiceManagerPrivate *priv = GET_PRIVATE(self);
 
   g_signal_emit(self, signals[STATE_CHANGED], 0);
+
+  /* services need to be sorted again due to the state change */
+  priv->services = g_list_sort(priv->services, cmp_services);
+
+  g_signal_emit(self, signals[SERVICES_UPDATED], 0);
 }
 
 static void service_strength_updated(Service *service, gpointer user_data)
@@ -209,7 +328,8 @@
     if (service == NULL)
       continue;
 
-    priv->services = g_list_append(priv->services, service);
+    priv->services = g_list_insert_sorted(priv->services, service,
+					  cmp_services);
   }
 
   g_debug("services updated (total %d, new %d, removed %d)",

=== modified file 'tests/mock-service.c'
--- tests/mock-service.c	2010-11-24 12:35:47 +0000
+++ tests/mock-service.c	2010-12-03 11:58:18 +0000
@@ -20,6 +20,9 @@
 
 #include "service.h"
 
+/* FIXME: should derive from DBUSMENU_TYPE_MENUITEM */
+G_DEFINE_TYPE(Service, service, G_TYPE_OBJECT)
+
 Service *service_new(ConnmanService *service, Manager *ns)
 {
   return NULL;
@@ -44,3 +47,11 @@
 {
   return 0;
 }
+
+static void service_class_init(ServiceClass *klass)
+{
+}
+
+static void service_init(Service *self)
+{
+}