Merge lp:~dbusmenu-team/ubuntu/precise/libdbusmenu/upstream into lp:~ubuntu-desktop/libdbusmenu/ubuntu

[Ted Gould]

Fix gedit for Seb

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-08 15:58:14 +0000
+++ ChangeLog	2012-03-09 20:38:32 +0000
@@ -1,5 +1,55 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.5.94
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing underscores in the ATK name
+
[phone]  Ted Gould  <[e-mail]>
+
+	Restructuring slightly to have two cases, allocating memory and not allocating
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Remove the underscores used for mnewmonics, as orca speaks them, which is not
+	what we want.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure to disconnect theme changed handler universally
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attaching bug
+
[phone]  Ted Gould  <[e-mail]>
+
+	Missing a couple of cases of removing the signal handler and clearing the stored value
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure the ATK object name always gets set to the label if nothing else
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Set the accessible name from the dbusmenu item label. THis is a work-around until GTK follows atk docs.
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Merge from trunk.
+
[phone]  Luke Yelavich  <[e-mail]>
+
+	Do not set the accessible name to an empty string if the accessible_desc
+	property = NULL. Yes this was recently changed so that dbusmenu conformed
+	to Atk documentation, but the GTK menu item accessibility code does not yet
+	conform to sed documentation. As a result, all dbusmenu menu items that do not
+	have the accessible_desc property set end up getting an empty string for their
+	accessible name. In the long term, GTK accessibility needs to be fixed.
+
 2012-03-08  Ted Gould  <[e-mail]>
 
 	0.5.93
 
=== modified file 'configure'
--- configure	2012-03-08 16:01:54 +0000
+++ configure	2012-03-09 20:38:32 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.93.
+# Generated by GNU Autoconf 2.68 for libdbusmenu 0.5.94.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -572,8 +572,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.5.93'
-PACKAGE_STRING='libdbusmenu 0.5.93'
+PACKAGE_VERSION='0.5.94'
+PACKAGE_STRING='libdbusmenu 0.5.94'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1437,7 +1437,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 libdbusmenu 0.5.93 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.5.94 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1507,7 +1507,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.5.93:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.5.94:";;
    esac
   cat <<\_ACEOF
 
@@ -1656,7 +1656,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.5.93
+libdbusmenu configure 0.5.94
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2027,7 +2027,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdbusmenu $as_me 0.5.93, which was
+It was created by libdbusmenu $as_me 0.5.94, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2848,7 +2848,7 @@
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.5.93
+ VERSION=0.5.94
 
 
 # Some tools Automake needs.
@@ -14423,7 +14423,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=10
+LIBDBUSMENU_REVISION=11
 LIBDBUSMENU_AGE=0
 
 
@@ -15777,7 +15777,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdbusmenu $as_me 0.5.93, which was
+This file was extended by libdbusmenu $as_me 0.5.94, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15843,7 +15843,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdbusmenu config.status 0.5.93
+libdbusmenu config.status 0.5.94
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2012-03-08 16:01:54 +0000
+++ configure.ac	2012-03-09 20:38:32 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.5.93, [e-mail])
+AC_INIT(libdbusmenu, 0.5.94, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.5.93, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.5.94, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -165,7 +165,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=10
+LIBDBUSMENU_REVISION=11
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-09 12:03:10 +0000
+++ debian/changelog	2012-03-09 20:38:32 +0000
@@ -1,3 +1,11 @@
+libdbusmenu (0.5.94-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Fixing setting name of ATK objects
+    * Cleaning up a warning on shutdown (LP: #950762)
+
+ -- Ted Gould <[e-mail]>  Fri, 09 Mar 2012 14:35:38 -0600
+
 libdbusmenu (0.5.93-0ubuntu1) precise; urgency=low
 
   * New upstream release.
 
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html	2012-03-08 15:58:14 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html	2012-03-09 20:38:32 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp114464"></a>API</h2></div></div></div>
+<a name="idp3882768"></a>API</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"> — The server signals changed and
 
=== modified file 'docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html'
--- docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html	2012-01-31 05:20:48 +0000
+++ docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html	2012-03-09 20:38:32 +0000
@@ -1568,8 +1568,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A list of strings or NULL if there are
-none. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span>
+<td>A list of
+strings or NULL if there are none. <span class="annotation">[<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span>
 </td>
 </tr>
 </tbody>
 
=== modified file 'docs/libdbusmenu-glib/reference/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml	2012-03-08 16:01:54 +0000
+++ docs/libdbusmenu-glib/reference/version.xml	2012-03-09 20:38:32 +0000
@@ -1,1 +1,1 @@
-0.5.93
+0.5.94
 
=== modified file 'docs/libdbusmenu-glib/reference/xml/menuitem.xml'
--- docs/libdbusmenu-glib/reference/xml/menuitem.xml	2012-01-31 05:20:48 +0000
+++ docs/libdbusmenu-glib/reference/xml/menuitem.xml	2012-03-09 20:38:32 +0000
@@ -1137,8 +1137,8 @@
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
 <listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to list the properties on</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A list of strings or NULL if there are
-none. <emphasis role="annotation">[<acronym>transfer container</acronym>]</emphasis></simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A list of
+strings or NULL if there are none. <emphasis role="annotation">[<acronym>transfer container</acronym>][<acronym>element-type</acronym> utf8]</emphasis></simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-properties-copy" role="function">
 <title>dbusmenu_menuitem_properties_copy ()</title>
 
=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html	2012-03-08 15:58:14 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html	2012-03-09 20:38:32 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp3304320"></a>API</h2></div></div></div>
+<a name="idp3527472"></a>API</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="libdbusmenu-gtk-DbusmenuGtkMenu.html">DbusmenuGtkMenu</a></span><span class="refpurpose"> — A GTK Menu Object that syncronizes over DBus</span>
 
=== modified file 'docs/libdbusmenu-gtk/reference/version.xml'
--- docs/libdbusmenu-gtk/reference/version.xml	2012-03-08 16:01:54 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml	2012-03-09 20:38:32 +0000
@@ -1,1 +1,1 @@
-0.5.93
+0.5.94
 
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2012-02-15 17:36:32 +0000
+++ libdbusmenu-gtk/client.c	2012-03-09 20:38:32 +0000
@@ -735,17 +735,29 @@
 		return;
 	}
 
-	const gchar * setname = NULL;
 
 	if (variant != NULL) {
-		setname = g_variant_get_string(variant, NULL);
-	}
-
-	if (setname == NULL) {
-		setname = "";
-	}
-
-	atk_object_set_name(aobj, setname);
+		const gchar * setname = NULL;
+		setname = g_variant_dup_string(variant, NULL);
+		atk_object_set_name(aobj, setname);
+	} else {
+	/* The atk docs advise to set the name of the atk object to an empty
+	 * string, but GTK doesn't yet do the same, and setting the name to NULL
+	 * causes tests to fail.
+	 */
+		gchar * setname = NULL;
+		const gchar * label = NULL;
+		/* We don't want the underscore for mnewmonics */
+		label = dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL);
+
+		GRegex * regex = g_regex_new ("_", 0, 0, NULL);
+		setname = g_regex_replace_literal (regex, label, -1, 0, "", 0, NULL);
+		g_regex_unref(regex);
+
+		atk_object_set_name(aobj, setname);
+		g_free(setname);
+	}
+
 	return;
 }
 
 
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2012-03-08 16:01:54 +0000
+++ libdbusmenu-gtk/parser.c	2012-03-09 20:38:32 +0000
@@ -229,7 +229,12 @@
 static void
 widget_freed (gpointer data, GObject * obj)
 {
-	g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), obj);
+	ParserData * pdata = (ParserData *)data;
+
+	if (pdata->theme_changed_sig != 0) {
+		g_signal_handler_disconnect(gtk_icon_theme_get_default(), pdata->theme_changed_sig);
+		pdata->theme_changed_sig = 0;
+	}
 
 	return;
 }
@@ -242,9 +247,12 @@
 	ParserData *pdata = (ParserData *)g_object_get_data(G_OBJECT(obj), PARSER_DATA);
 
 	if (pdata != NULL && pdata->widget != NULL) {
-		g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), pdata->widget);
+		if (pdata->theme_changed_sig != 0) {
+			g_signal_handler_disconnect(gtk_icon_theme_get_default(), pdata->theme_changed_sig);
+			pdata->theme_changed_sig = 0;
+		}
 		g_object_steal_data(G_OBJECT(pdata->widget), CACHED_MENUITEM);
-		g_object_weak_unref(G_OBJECT(pdata->widget), widget_freed, NULL);
+		g_object_weak_unref(G_OBJECT(pdata->widget), widget_freed, pdata);
 	}
 }
 
@@ -286,7 +294,7 @@
 	g_object_set_data_full(G_OBJECT(item), PARSER_DATA, pdata, parse_data_free);
 
 	g_object_weak_ref(G_OBJECT(item), dbusmenu_item_freed, NULL);
-	g_object_weak_ref(G_OBJECT(widget), widget_freed, NULL);
+	g_object_weak_ref(G_OBJECT(widget), widget_freed, pdata);
 
 	pdata->widget = widget;
 	g_object_add_weak_pointer(G_OBJECT (widget), (gpointer*)&pdata->widget);