Merge lp:~ted/indicator-application/proper-ordering into lp:indicator-application/0.4

[Ted Gould]

Actually order the items to fixed locations. Oh, and move the networking one so it's closest to the system indicators.

[Matthew Paul Thomas (mpt)]

I know this is a tiny detail, but I'd prefer it overall the items were, starting from the end, in order from greatest to least likelihood of being there at all. That maximizes the overall probability that a menu on one Ubuntu computer will be in exactly the same place on another Ubuntu computer.

So, starting from the end:
- session menu
- clock
- sound menu
- network
- battery
- me
- messaging
- ibus
- keyboard.

(I don't know the difference between gsd-keyboard-xkb and gst-keyboard-xkb.)

[Conor Curran (cjcurran)]

review: Approve

[Ted Gould (ted)]

On Tue, 2011-03-15 at 11:25 +0000, Matthew Paul Thomas wrote:
> I know this is a tiny detail, but I'd prefer it overall the items were,
> starting from the end, in order from greatest to least likelihood of
> being there at all. That maximizes the overall probability that a menu
> on one Ubuntu computer will be in exactly the same place on another
> Ubuntu computer.

I agree with this goal, but I think that with us making the large change
from GNOME panel to Unity this cycle we shouldn't reorder the indicators
that are staying (roughly) the same. So I'd propose:

- session
- me
- clock
- messaging
- sound
- network
- battery
- ibus
- keyboard

Would that work?

> (I don't know the difference between gsd-keyboard-xkb and gst-keyboard-xkb.)

It was a typo in some versions so I've left it in. We could probably
drop it at this point though.

=== modified file 'data/ordering-override.keyfile'
--- data/ordering-override.keyfile	2010-08-20 15:13:35 +0000
+++ data/ordering-override.keyfile	2011-03-14 20:01:51 +0000
@@ -1,5 +1,6 @@
 [Ordering Index Overrides]
-gnome-power-manager=1
-gst-keyboard-xkb=2
-gsd-keyboard-xkb=3
-ibus=4
+nm_applet=1
+gnome-power-manager=2
+gst-keyboard-xkb=3
+gsd-keyboard-xkb=4
+ibus=5

=== modified file 'src/application-service-appstore.c'
--- src/application-service-appstore.c	2011-02-25 13:45:31 +0000
+++ src/application-service-appstore.c	2011-03-14 20:01:51 +0000
@@ -374,6 +374,7 @@
 	g_return_if_fail(filename != NULL);
 
 	if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
+		g_debug("Override file '%s' doesn't exist", filename);
 		return;
 	}
 
@@ -486,6 +487,7 @@
 		} /* else ignore */
 	}
 	g_variant_iter_free (iter);
+	g_variant_unref(properties);
 
 	if (menu == NULL || id == NULL || category == NULL || status == NULL ||
 	    icon_name == NULL) {
@@ -524,6 +526,7 @@
 			app->ordering_index = GPOINTER_TO_UINT(ordering_index_over);
 		}
 		g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index);
+		app->appstore->priv->applications = g_list_sort_with_data(app->appstore->priv->applications, app_sort_func, NULL);
 
 		if (label != NULL) {
 			app->label = g_variant_dup_string(label, NULL);