aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/ordering-override.keyfile3
-rw-r--r--debian/changelog8
-rw-r--r--src/application-service-appstore.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile
index dcfb75b..71d7c1a 100644
--- a/data/ordering-override.keyfile
+++ b/data/ordering-override.keyfile
@@ -1,2 +1,5 @@
[Ordering Index Overrides]
gnome-power-manager=1
+gst-keyboard-xkb=2
+gsd-keyboard-xkb=3
+ibus=4
diff --git a/debian/changelog b/debian/changelog
index aba846c..1016bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-application (0.2.5-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Fixing the position of new indicators (LP: #623205)
+ * Position the ibus and keyboard layout indicators correctly.
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 25 Aug 2010 13:30:25 -0500
+
indicator-application (0.2.5-0ubuntu1~ppa1) maverick; urgency=low
* New upstream release.
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index f52ea2d..d5f9a81 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -621,7 +621,7 @@ apply_status (Application * app)
g_signal_emit(G_OBJECT(app->appstore),
signals[APPLICATION_ADDED], 0,
newicon,
- g_list_index(priv->applications, app), /* Position */
+ get_position(app), /* Position */
app->dbus_name,
app->menu,
app->icon_theme_path,