Import upstream version 0.2.6

7 files changed, 46 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 101131b..bab1a9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 # Generated by Makefile. Do not edit.
 
+2010-08-25  Ted Gould  <ted@gould.cx>
+
+	Ordering i18n and keyboard indicators
+
+2010-08-20  Ted Gould  <ted@gould.cx>
+
+	Handling the typo
+
+2010-08-20  Ted Gould  <ted@gould.cx>
+
+	Adding keyboard and ibus to overrides
+
+2010-08-25  Ted Gould  <ted@gould.cx>
+
+	Putting new icons in the right place
+
+2010-08-20  Ted Gould  <ted@gould.cx>
+
+	Get the proper position for an application when it becomes visible.
+
+2010-08-19  Ted Gould  <ted@gould.cx>
+
+	0.2.5
+
+2010-08-19  Ted Gould  <ted@gould.cx>
+
+	Fix approver for function change
+
 2010-08-19  Ted Gould  <ted@gould.cx>
 
 	Adding a signal for approvers to be able to change their mind
diff --git a/configure b/configure
index 3f70b53..ab7214b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-application 0.2.5.
+# Generated by GNU Autoconf 2.67 for indicator-application 0.2.6.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -703,8 +703,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-application'
 PACKAGE_TARNAME='indicator-application'
-PACKAGE_VERSION='0.2.5'
-PACKAGE_STRING='indicator-application 0.2.5'
+PACKAGE_VERSION='0.2.6'
+PACKAGE_STRING='indicator-application 0.2.6'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-application 0.2.5 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,7 +1581,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-application 0.2.5:";;
+     short | recursive ) echo "Configuration of indicator-application 0.2.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1718,7 +1718,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-application configure 0.2.5
+indicator-application configure 0.2.6
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1998,7 +1998,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-application $as_me 0.2.5, which was
+It was created by indicator-application $as_me 0.2.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2819,7 +2819,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-application
- VERSION=0.2.5
+ VERSION=0.2.6
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13695,7 +13695,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-application $as_me 0.2.5, which was
+This file was extended by indicator-application $as_me 0.2.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13761,7 +13761,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-application config.status 0.2.5
+indicator-application config.status 0.2.6
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 035c9da..3f77cca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.2.5, ted@canonical.com)
+AC_INIT(indicator-application, 0.2.6, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.2.5)
+AM_INIT_AUTOMAKE(indicator-application, 0.2.6)
 
 AM_MAINTAINER_MODE
 
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/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml
index 0112544..383b4ac 100644
--- a/docs/reference/libappindicator-docs.sgml
+++ b/docs/reference/libappindicator-docs.sgml
@@ -8,7 +8,7 @@
   <bookinfo>
     <title>libappindicator Reference Manual</title>
     <releaseinfo>
-      for libappindicator 0.2.5
+      for libappindicator 0.2.6
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 3a4036f..53a75d6 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.2.5
+0.2.6
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,