Fix some formatting in connman.

Remove some commented lines in quickpanel.
Add some printfs to quickpanel sort.
Remove dead code line in illume2 layout.
Separate illume and illume2 modules in build process (this allows illume &
illume2 to be enabled/disabled separately)



SVN revision: 44841

6 files changed, 27 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index 82c4105eed..5efe9fd5bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,7 @@ AC_E_OPTIONAL_MODULE([gadman], true)
 AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
 AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
 AC_E_OPTIONAL_MODULE([illume], true)
+AC_E_OPTIONAL_MODULE([illume2], true)
 AC_E_OPTIONAL_MODULE([syscon], true)
 AC_E_OPTIONAL_MODULE([everything], true)
 AC_E_OPTIONAL_MODULE([systray], true)
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index ff73644049..ffce5abaef 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -239,7 +239,11 @@ SUBDIRS += connman
 endif
 
 if USE_MODULE_ILLUME
-SUBDIRS += illume illume2 illume-home illume-softkey illume-keyboard illume-indicator illume-kbd-toggle illume-mode-toggle
+SUBDIRS += illume
+endif
+
+if USE_MODULE_ILLUME2
+SUBDIRS += illume2 illume-home illume-softkey illume-keyboard illume-indicator illume-kbd-toggle illume-mode-toggle
 endif
 
 if USE_MODULE_SYSCON
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 5dd4b3d1d5..d0705265af 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -1249,13 +1249,13 @@ e_modapi_init(E_Module *m)
 
    c = e_dbus_bus_get(DBUS_BUS_SYSTEM);
    if (!c)
-      return NULL;
+     return NULL;
    if (!e_connman_system_init(c))
      return NULL;
 
    ctxt = E_NEW(E_Connman_Module_Context, 1);
    if (!ctxt)
-      return NULL;
+     return NULL;
 
    _connman_actions_register(ctxt);
    e_gadcon_provider_register(&_gc_class);
@@ -1270,12 +1270,12 @@ static void
 _connman_instances_free(E_Connman_Module_Context *ctxt)
 {
    while (ctxt->instances)
-   {
-      E_Connman_Instance *inst;
+     {
+        E_Connman_Instance *inst;
 
-      inst = ctxt->instances->data;
-      e_object_del(E_OBJECT(inst->gcc));
-   }
+        inst = ctxt->instances->data;
+        e_object_del(E_OBJECT(inst->gcc));
+     }
 }
 
 EAPI int
@@ -1286,7 +1286,7 @@ e_modapi_shutdown(E_Module *m)
 
    ctxt = m->data;
    if (!ctxt)
-      return 0;
+     return 0;
 
    element = e_connman_manager_get();
    e_connman_element_listener_del
@@ -1327,6 +1327,6 @@ e_modapi_save(E_Module *m)
 
    ctxt = m->data;
    if (!ctxt)
-      return 0;
+     return 0;
    return 1;
 }
diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
index c92094f8ad..29d4f55ff8 100644
--- a/src/modules/illume2/e_mod_layout_illume.c
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -230,7 +230,6 @@ _drag_end(E_Border *bd)
 {
    /* HANDLE A BORDER DRAG BEING ENDED */
    ecore_x_e_illume_drag_set(bd->client.win, 0);
-//   _zone_layout(bd->zone);
 }
 
 static void 
diff --git a/src/modules/illume2/e_quickpanel.c b/src/modules/illume2/e_quickpanel.c
index 885787cbf6..73bbbca704 100644
--- a/src/modules/illume2/e_quickpanel.c
+++ b/src/modules/illume2/e_quickpanel.c
@@ -225,9 +225,7 @@ _e_quickpanel_cb_border_pre_post_fetch(void *data, void *data2)
         e_mod_border_top_shelf_size_get(qp->zone, NULL, &th);
         e_border_fx_offset(bd, 0, (bd->h - th));
      }
-   qp->borders = eina_list_append(qp->borders, bd);
-   qp->borders = eina_list_sort(qp->borders, -1, _e_quickpanel_cb_sort);
-//   qp->borders = eina_list_reverse(qp->borders);
+   qp->borders = eina_list_sorted_insert(qp->borders, _e_quickpanel_cb_sort, bd);
 }
 
 static E_Quickpanel *
@@ -365,13 +363,15 @@ _e_quickpanel_cb_sort(const void *b1, const void *b2)
    const E_Border *bd1, *bd2;
    int major1, major2;
 
-   if (!(bd1 = b1)) return -1;
+   if (!(bd1 = b1)) return 0;
    if (!(bd2 = b2)) return 1;
+   printf("Checking: %s against %s\n", bd2->client.icccm.name, bd1->client.icccm.name);
    major1 = ecore_x_e_illume_quickpanel_priority_major_get(bd1->client.win);
    major2 = ecore_x_e_illume_quickpanel_priority_major_get(bd2->client.win);
-   if (major1 < major2) return -1;
-   else if (major1 > major2) return 1;
-   else 
+   if (major2 > major1) return 1;
+   else if (major2 < major1) return -1;
+   /*
+   else if (major2 == major1) 
      {
         int minor1, minor2;
 
@@ -379,9 +379,11 @@ _e_quickpanel_cb_sort(const void *b1, const void *b2)
           ecore_x_e_illume_quickpanel_priority_minor_get(bd1->client.win);
         minor2 = 
           ecore_x_e_illume_quickpanel_priority_minor_get(bd2->client.win);
-        if (minor1 < minor2) return -1;
-        else if (minor1 > minor2) return 1;
+        printf("Minors: %d %d\n", minor2, minor1);
+        if (minor2 > minor1) return 1;
+        else if (minor2 < minor1) return -1;
      }
+    */
    return 0;
 }
 
diff --git a/x-ui.sh b/x-ui.sh
index abd6203708..5b393483c3 100755
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -10,7 +10,7 @@ Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 -host-cursor &
 #Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x800x16 &
 #Xephyr :1 -noreset -ac -br -dpi 183 -screen 800x480x16 &
 #Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 &
-#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 &
+#Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480x16 -host-cursor &
 
 #Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640 &
 #Xephyr :1 -noreset -ac -br -dpi 284 -screen 640x480 &