diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-25 13:32:26 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-25 13:32:26 -0500 |
| commit | 87c04ea8c9c417c9e7d626c10d6f2336f120a1b0 (patch) | |
| tree | 47ec6d71950ee60158041c0af5867329d8895481 | |
| parent | 618737a96a7e64376d68aa9d8fbf2acd7cd0904f (diff) | |
| parent | c74badef6ebd674dcdb390744487c9848a3fdd5c (diff) | |
| download | libayatana-appindicator-87c04ea8c9c417c9e7d626c10d6f2336f120a1b0.tar.gz libayatana-appindicator-87c04ea8c9c417c9e7d626c10d6f2336f120a1b0.tar.bz2 libayatana-appindicator-87c04ea8c9c417c9e7d626c10d6f2336f120a1b0.zip | |
* Upstream Merge
* Fixing the position of new indicators (LP: #623205)
* Position the ibus and keyboard layout indicators correctly.
| -rw-r--r-- | data/ordering-override.keyfile | 3 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 2 |
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, |