Merge lp:~indicator-applet-developers/libindicator/ubuntu into lp:~ubuntu-desktop/libindicator/ubuntu

[Ted Gould]

Fixing the loader

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-20 02:43:09 +0000
+++ ChangeLog	2011-09-28 15:55:30 +0000
@@ -1,5 +1,13 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.4.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make sure our menus don't get proxied
+
 2011-09-19  Ted Gould  <[e-mail]>
 
 	0.4.0

=== modified file 'configure'
--- configure	2011-09-20 02:44:03 +0000
+++ configure	2011-09-28 15:55:30 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libindicator 0.4.0.
+# Generated by GNU Autoconf 2.68 for libindicator 0.4.1.
 #
 # Report bugs to <http://bugs.launchpad.net/libindicator>.
 #
@@ -709,8 +709,8 @@
 # Identity of this package.
 PACKAGE_NAME='libindicator'
 PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.4.0'
-PACKAGE_STRING='libindicator 0.4.0'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='libindicator 0.4.1'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator'
 PACKAGE_URL='http://launchpad.net/libindicator'
 
@@ -1452,7 +1452,7 @@
   # 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 libindicator 0.4.0 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1522,7 +1522,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libindicator 0.4.0:";;
+     short | recursive ) echo "Configuration of libindicator 0.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1638,7 +1638,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicator configure 0.4.0
+libindicator configure 0.4.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1916,7 +1916,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libindicator $as_me 0.4.0, which was
+It was created by libindicator $as_me 0.4.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2738,7 +2738,7 @@
 
 # Define the identity of the package.
  PACKAGE='libindicator'
- VERSION='0.4.0'
+ VERSION='0.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11865,7 +11865,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libindicator $as_me 0.4.0, which was
+This file was extended by libindicator $as_me 0.4.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11932,7 +11932,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libindicator config.status 0.4.0
+libindicator config.status 0.4.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-09-20 02:44:03 +0000
+++ configure.ac	2011-09-28 15:55:30 +0000
@@ -1,5 +1,5 @@
 AC_INIT([libindicator],
-        [0.4.0],
+        [0.4.1],
         [http://bugs.launchpad.net/libindicator],
         [libindicator],
         [http://launchpad.net/libindicator])

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-20 16:37:24 +0000
+++ debian/changelog	2011-09-28 15:55:30 +0000
@@ -1,3 +1,10 @@
+libindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Ensure loader doesn't use menu proxy
+
+ -- Ted Gould <[e-mail]>  Wed, 28 Sep 2011 10:51:08 -0500
+
 libindicator (0.4.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'tools/indicator-loader.c'
--- tools/indicator-loader.c	2011-07-11 21:00:12 +0000
+++ tools/indicator-loader.c	2011-09-28 15:55:30 +0000
@@ -153,6 +153,9 @@
 int
 main (int argc, char ** argv)
 {
+	/* Make sure we don't proxy to ourselves */
+	g_unsetenv("UBUNTU_MENUPROXY");
+
 	gtk_init(&argc, &argv);
 
 	if (argc != 2) {