Import upstream version 0.2.2

6 files changed, 38 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 22eab51..6ef8a68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 # Generated by Makefile. Do not edit.
 
+2010-07-07  Ted Gould  <ted@gould.cx>
+
+	Merging this branch, but I think it's fixes must have gone in with another.
+
+2010-06-18  Ted Gould  <ted@gould.cx>
+
+	Setting the policy version.
+
+2010-07-07  Ted Gould  <ted@gould.cx>
+
+	Working with the better container signals
+
+2010-06-11  Ted Gould  <ted@gould.cx>
+
+	Changing signal names and getting the ones on the base menu as well.
+
+2010-06-11  Ted Gould  <ted@gould.cx>
+
+	Changing the signal names
+
 2010-06-21  Ted Gould  <ted@gould.cx>
 
 	0.2.1
diff --git a/configure b/configure
index a858283..204b9e7 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.65 for indicator-application 0.2.1.
+# Generated by GNU Autoconf 2.65 for indicator-application 0.2.2.
 #
 # 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.1'
-PACKAGE_STRING='indicator-application 0.2.1'
+PACKAGE_VERSION='0.2.2'
+PACKAGE_STRING='indicator-application 0.2.2'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1505,7 +1505,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.1 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.2.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1576,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-application 0.2.1:";;
+     short | recursive ) echo "Configuration of indicator-application 0.2.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1709,7 +1709,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-application configure 0.2.1
+indicator-application configure 0.2.2
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1989,7 +1989,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.1, which was
+It was created by indicator-application $as_me 0.2.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2803,7 +2803,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-application
- VERSION=0.2.1
+ VERSION=0.2.2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13684,7 +13684,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.1, which was
+This file was extended by indicator-application $as_me 0.2.2, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13750,7 +13750,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.1
+indicator-application config.status 0.2.2
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index bd3c6a4..86c60e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.2.1, ted@canonical.com)
+AC_INIT(indicator-application, 0.2.2, 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.1)
+AM_INIT_AUTOMAKE(indicator-application, 0.2.2)
 
 AM_MAINTAINER_MODE
 
diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml
index 16877c1..255e9ec 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.1
+      for libappindicator 0.2.2
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 0c62199..ee1372d 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.2.1
+0.2.2
diff --git a/src/app-indicator.c b/src/app-indicator.c
index bc43e58..32f512f 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -1408,12 +1408,12 @@ container_iterate (GtkWidget *widget,
                                 container_iterate,
                                 child);
           g_signal_connect_object (submenu,
-                                   "add",
+                                   "child-added",
                                    G_CALLBACK (submenu_changed),
                                    child,
                                    0);
           g_signal_connect_object (submenu,
-                                   "remove",
+                                   "child-removed",
                                    G_CALLBACK (submenu_changed),
                                    child,
                                    0);
@@ -1552,11 +1552,11 @@ app_indicator_set_menu (AppIndicator *self, GtkMenu *menu)
   check_connect (self);
 
   g_signal_connect (menu,
-                    "add",
+                    "child-added",
                     G_CALLBACK (client_menu_changed),
                     self);
   g_signal_connect (menu,
-                    "remove",
+                    "child-removed",
                     G_CALLBACK (client_menu_changed),
                     self);
 }