Merge lp:~laney/indicator-applet/invert-new-style-indicators into lp:indicator-applet/13.10

[Iain Lane]

Only prioritise and invert new-style indicators

Only the new-style indicators need to be inverted without changes to the logic in place_in_menu_cb. The diff over r409 is probably better to look at than this.

I also copied the static order table from u-p-s to refresh it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-applet-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-applet-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-applet-ci/9/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Why are older indicators that have already been supplanted (libdatetime.so, libsession.so, libpower.so) added back in by this patch?

[lp:~laney/indicator-applet/invert-new-style-indicators]

414. By Iain Lane on 2013-07-28

Remove new-style indicators from static order list.

[Iain Lane (laney)]

On Sat, Jul 27, 2013 at 08:29:29PM -0000, Charles Kerr wrote:
> Why are older indicators that have already been supplanted (libdatetime.so, libsession.so, libpower.so) added back in by this patch?

I just copied the list from unity-panel-service.

Let me remove them.

,----
| Pushed up to revision 414.
`----

There we go.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/indicator-applet-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-applet-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-applet-saucy-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-applet-ci/10/rebuild

review: Approve (continuous-integration)

[Alberts Muktupāvels (muktupavels)]

I submitted almost identical change almost 10 days ago - https://code.launchpad.net/~albertsmuktupavels/indicator-applet/indicator-applet/+merge/175760

I will delete my branch when this will be approved.

[Iain Lane (laney)]

On Sun, Jul 28, 2013 at 04:44:23PM -0000, Alberts Muktupāvels wrote:
> I submitted almost identical change almost 10 days ago - https://code.launchpad.net/~albertsmuktupavels/indicator-applet/indicator-applet/+merge/175760
>
> I will delete my branch when this will be approved.

Oops sorry, I didn't see that :(

Thanks for your work on -applet :-)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Alberts Muktupāvels (muktupavels)]

Why it takes so long to approve changes? Currently indicators are in wrong positions because of my mistake. :(

review: Approve

[Lars Karlitski (larsu)]

Looks good to me.

review: Approve

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2013-07-17 18:29:16 +0000
+++ src/applet-main.c	2013-07-28 14:33:27 +0000
@@ -40,7 +40,7 @@
   {"libsyncindicator.so", NULL},              /* indicator-sync */
   {"libapplication.so", "gsd-keyboard-xkb"},  /* keyboard layout selector */
   {"libmessaging.so", NULL},                  /* indicator-messages */
-  {"libapplication.so", "bluetooth-manager"}, /* bluetooth manager */
+  {"libbluetooth.so", NULL},                  /* indicator-bluetooth */
   {"libnetwork.so", NULL},                    /* indicator-network */
   {"libnetworkmenu.so", NULL},                /* indicator-network */
   {"libapplication.so", "nm-applet"},         /* network manager */
@@ -151,7 +151,7 @@
   for (i = 0; indicator_order[i][0] != NULL; i++) {
     if (g_strcmp0(name, indicator_order[i][0]) == 0 &&
         g_strcmp0(hint, indicator_order[i][1]) == 0) {
-      return 1000 - i;
+      return i;
     }
   }
 
@@ -191,8 +191,8 @@
   }
 
   /* The objects don't match yet, keep looking */
-  if (objposition > position->objposition) {
-    position->menupos--;
+  if (objposition < position->objposition) {
+    position->menupos++;
     return;
   }
 
@@ -200,13 +200,13 @@
   IndicatorObjectEntry * entry = (IndicatorObjectEntry *)g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
   gint entryposition = indicator_object_get_location(io, entry);
 
+  if (entryposition > position->entryposition) {
+    position->found = TRUE;
+    return;
+  }
+
   if (entryposition < position->entryposition) {
-    position->found = TRUE;
-    return;
-  }
-
-  if (entryposition > position->entryposition) {
-    position->menupos--;
+    position->menupos++;
     return;
   }
 
@@ -232,6 +232,7 @@
   if (entry->name_hint != NULL) {
     const gchar *name = (const gchar *)g_object_get_data(G_OBJECT(io), IO_DATA_NAME);
     gint entry_position = name2order(name, entry->name_hint);
+    g_debug ("Placing %s (%s): %d", name, entry->name_hint, entry_position);
 
     /* If we don't find the entry, fall back to the indicator object's position */
     if (entry_position > -1)
@@ -616,8 +617,8 @@
 	g_object_set_data_full(o, IO_DATA_MENUITEM_LOOKUP, g_hash_table_new (g_direct_hash, g_direct_equal), (GDestroyNotify)g_hash_table_destroy);
 	g_object_set_data_full(o, IO_DATA_NAME, g_strdup(name), g_free);
 	
-	int pos = indicator_object_get_position(o);
-	if (pos < 0) {
+	int pos = 5000 - indicator_object_get_position(object);
+	if (pos > 5000) {
 	    pos = name2order(name, NULL);
 	}