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

[Ted Gould]

Release 0.4.1

[lp:~dbusmenu-team/libdbusmenu/ubuntu]

137. By Ken VanDine on 2011-03-31

releasing version 0.4.1-0ubuntu1

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-23 19:46:23 +0000
+++ ChangeLog	2011-03-31 18:59:23 +0000
@@ -1,5 +1,83 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.4.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensuring that our iterators have variants to reference and ref'ing them correctly.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Be more specific about the shortcut type
+
[phone]  Ted Gould  <[e-mail]>
+
+	Split out into another variable
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use loop instead of next
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in some protections from NULL parameters.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Don't unref a variant we didn't have a ref to on error
+
[phone]  Ted Gould  <[e-mail]>
+
+	Turning GTK Menuitems without labels into separators.
+
[phone]  Chris Coulson  <[e-mail]>
+
+	Remove some code duplication introduced in this branch
+
[phone]  Chris Coulson  <[e-mail]>
+
+	- Don't change the type of existing menu items in the server. This
+	isn't handled in the client too well
+	- Handle a GtkMenuItem's GtkLabel being removed too
+
[phone]  Chris Coulson  <[e-mail]>
+
+	Remove the now unneeded null pointer check on label in construct_dbusmenu_for_widget.
+	Also, don't use a strcmp in widget_notify_cb for checking if the menuitem is a separator. Just do a null pointer
+	check on pdata->label instead
+
[phone]  Chris Coulson  <[e-mail]>
+
+	Revert the last commit and handle the same problem in the parser instead
+
[phone]  Chris Coulson  <[e-mail]>
+
+	Don't set a default label for menuitems. Some applications (eg, xchat and pidgin) do silly things like
+	creating GtkMenuItems's without a label for separators (rather than using the GtkSeparatorMenuItem class).
+	GTK correctly renders these as separators, so we need to handle it too by not setting a default label on these
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensure the parent stays ref'd
+
[phone]  Michael Terry  <[e-mail]>
+
+	fix some potential memory issues in hopes of fixing a reported crash
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protect our properties parsing a bit more.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attaching bug
+
[phone]  Ted Gould  <[e-mail]>
+
+	Put in some more protections on the types for property variants and generate some errors
+
 2011-03-23  Ted Gould  <[e-mail]>
 
 	0.4.0

=== modified file 'configure'
--- configure	2011-03-23 19:48:54 +0000
+++ configure	2011-03-31 18:59:23 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libdbusmenu 0.4.0.
+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.4.1.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -703,8 +703,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.4.0'
-PACKAGE_STRING='libdbusmenu 0.4.0'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='libdbusmenu 0.4.1'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1541,7 +1541,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.4.0 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1611,7 +1611,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdbusmenu 0.4.0:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1751,7 +1751,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdbusmenu configure 0.4.0
+libdbusmenu configure 0.4.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2122,7 +2122,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.4.0, which was
+It was created by libdbusmenu $as_me 0.4.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2943,7 +2943,7 @@
 
 # Define the identity of the package.
  PACKAGE=libdbusmenu
- VERSION=0.4.0
+ VERSION=0.4.1
 
 
 # Some tools Automake needs.
@@ -13294,7 +13294,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=11
+LIBDBUSMENU_REVISION=12
 LIBDBUSMENU_AGE=0
 
 
@@ -14616,7 +14616,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.4.0, which was
+This file was extended by libdbusmenu $as_me 0.4.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14682,7 +14682,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.4.0
+libdbusmenu config.status 0.4.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-03-23 19:48:54 +0000
+++ configure.ac	2011-03-31 18:59:23 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.4.0, [e-mail])
+AC_INIT(libdbusmenu, 0.4.1, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.4.0, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.4.1, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -134,7 +134,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=11
+LIBDBUSMENU_REVISION=12
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-28 19:15:29 +0000
+++ debian/changelog	2011-03-31 18:59:23 +0000
@@ -1,3 +1,12 @@
+libdbusmenu (0.4.1-0ubuntu1~ppa1) natty; urgency=low
+
+  * New upstream release.
+    * Managed variant iterators better to stop crash when dealing
+      with apps that have multiple shortcuts (LP: #741726)
+    * Handled GtkMenuItems with no labels as separators (LP: #729187)
+
+ -- Ted Gould <[e-mail]>  Thu, 31 Mar 2011 13:56:54 -0500
+
 libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low
 
   * Cherry picked fix for potential memory issues to fix unity-panel-service

=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html	2011-03-23 19:46:23 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html	2011-03-31 18:59:23 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id440860"></a>API</h2></div></div></div>
+<a name="id471000"></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/version.xml'
--- docs/libdbusmenu-glib/reference/version.xml	2011-03-23 19:48:54 +0000
+++ docs/libdbusmenu-glib/reference/version.xml	2011-03-31 18:59:23 +0000
@@ -1,1 +1,1 @@
-0.4.0
+0.4.1

=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html	2011-03-23 19:46:23 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html	2011-03-31 18:59:23 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id331770"></a>API</h2></div></div></div>
+<a name="id520868"></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	2011-03-23 19:48:54 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml	2011-03-31 18:59:23 +0000
@@ -1,1 +1,1 @@
-0.4.0
+0.4.1

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-03-28 19:15:29 +0000
+++ libdbusmenu-glib/client.c	2011-03-31 18:59:23 +0000
@@ -1334,8 +1334,16 @@
 
 	if (error != NULL) {
 		g_warning("Error getting properties on a menuitem: %s", error->message);
-		g_object_unref(data);
-		return;
+		goto out;
+	}
+
+	if (properties == NULL) {
+		goto out;
+	}
+
+	if (!g_variant_is_of_type(properties, G_VARIANT_TYPE("a{sv}"))) {
+		g_warning("Properties are of type '%s' instead of type '%s'", g_variant_get_type_string(properties), "a{sv}");
+		goto out;
 	}
 
 	GVariantIter iter;
@@ -1348,6 +1356,7 @@
 		dbusmenu_menuitem_property_set_variant(item, key, value);
 	}
 
+out:
 	g_object_unref(data);
 
 	return;
@@ -1366,12 +1375,16 @@
 		g_warning("Unable to replace properties on %d: %s", dbusmenu_menuitem_get_id(DBUSMENU_MENUITEM(data)), error->message);
 		have_error = TRUE;
 	}
+	
+	if (properties == NULL) {
+		have_error = TRUE;
+	}
 
 	/* Get the list of the current properties */
 	GList * current_props = dbusmenu_menuitem_properties_list(DBUSMENU_MENUITEM(data));
 	GList * tmp = NULL;
 
-	if (properties != NULL && have_error == FALSE) {
+	if (!have_error && g_variant_is_of_type(properties, G_VARIANT_TYPE("a{sv}"))) {
 		GVariantIter iter;
 		g_variant_iter_init(&iter, properties);
 		gchar * name; GVariant * value;
@@ -1415,8 +1428,12 @@
 
 	if (error != NULL) {
 		g_warning("Error getting properties on a new menuitem: %s", error->message);
-		g_object_unref(propdata->item);
-		return;
+		goto out;
+	}
+
+	if (properties == NULL) {
+		g_warning("Not realizing new item as properties for it were unavailable");
+		goto out;
 	}
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(propdata->client);
@@ -1450,6 +1467,7 @@
 		g_signal_emit(G_OBJECT(propdata->client), signals[NEW_MENUITEM], 0, propdata->item, TRUE);
 	}
 
+out:
 	g_object_unref(propdata->item);
 	g_free(propdata);
 

=== modified file 'libdbusmenu-glib/defaults.c'
--- libdbusmenu-glib/defaults.c	2011-02-25 14:47:56 +0000
+++ libdbusmenu-glib/defaults.c	2011-03-31 18:59:23 +0000
@@ -81,11 +81,11 @@
 	/* Standard defaults */
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_VISIBLE,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_ENABLED,        G_VARIANT_TYPE_BOOLEAN,   g_variant_new_boolean(TRUE)); 
-	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_LABEL,          G_VARIANT_TYPE_STRING,    g_variant_new_string(_("Label Empty"))); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_LABEL,          G_VARIANT_TYPE_STRING,    g_variant_new_string(_("Label Empty")));
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_ICON_NAME,      G_VARIANT_TYPE_STRING,    NULL); 
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE,    G_VARIANT_TYPE_STRING,    NULL); 
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_TOGGLE_STATE,   G_VARIANT_TYPE_INT32,     NULL); 
-	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_SHORTCUT,       G_VARIANT_TYPE_ARRAY,     NULL); 
+	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_SHORTCUT,       G_VARIANT_TYPE("aas"),    NULL); 
 	dbusmenu_defaults_default_set(self,   DBUSMENU_CLIENT_TYPES_DEFAULT,    DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY,  G_VARIANT_TYPE_STRING,    NULL); 
 
 	/* Separator defaults */

=== modified file 'libdbusmenu-gtk/menuitem.c'
--- libdbusmenu-gtk/menuitem.c	2011-03-21 16:06:57 +0000
+++ libdbusmenu-gtk/menuitem.c	2011-03-31 18:59:23 +0000
@@ -275,6 +275,17 @@
 void
 dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifier)
 {
+	guint dummykey;
+	GdkModifierType dummymodifier;
+
+	if (key == NULL) {
+		key = &dummykey;
+	}
+
+	if (modifier == NULL) {
+		modifier = &dummymodifier;
+	}
+
 	*key = 0;
 	*modifier = 0;
 
@@ -287,15 +298,15 @@
 
 	if (g_variant_n_children(wrapper) != 1) {
 		g_warning("Unable to parse shortcut, too many keys");
-		g_variant_unref(wrapper);
 		return;
 	}
 
 	GVariantIter iter;
-	g_variant_iter_init(&iter, g_variant_get_child_value(wrapper, 0));
+	GVariant * child = g_variant_get_child_value(wrapper, 0);
+	g_variant_iter_init(&iter, child);
 	gchar * string;
 
-	while(g_variant_iter_next(&iter, "s", &string)) {
+	while(g_variant_iter_loop(&iter, "s", &string)) {
 		if (g_strcmp0(string, DBUSMENU_MENUITEM_SHORTCUT_CONTROL) == 0) {
 			*modifier |= GDK_CONTROL_MASK;
 		} else if (g_strcmp0(string, DBUSMENU_MENUITEM_SHORTCUT_ALT) == 0) {
@@ -308,10 +319,10 @@
 			GdkModifierType tempmod;
 			gtk_accelerator_parse(string, key, &tempmod);
 		}
-
-		g_free(string);
 	}
 
+	g_variant_unref(child);
+
 	return;
 }
 

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-03-21 14:03:18 +0000
+++ libdbusmenu-gtk/parser.c	2011-03-31 18:59:23 +0000
@@ -454,7 +454,7 @@
 
       gboolean visible = FALSE;
       gboolean sensitive = FALSE;
-      if (GTK_IS_SEPARATOR_MENU_ITEM (widget))
+      if (GTK_IS_SEPARATOR_MENU_ITEM (widget) || !find_menu_label (widget))
         {
           dbusmenu_menuitem_property_set (mi,
                                           "type",
@@ -512,21 +512,18 @@
 
           GtkWidget *label = find_menu_label (widget);
 
-          if (label)
-            {
-              // Sometimes, an app will directly find and modify the label
-              // (like empathy), so watch the label especially for that.
-              gchar * text = sanitize_label (GTK_LABEL (label));
-              dbusmenu_menuitem_property_set (mi, "label", text);
-              g_free (text);
+          // Sometimes, an app will directly find and modify the label
+          // (like empathy), so watch the label especially for that.
+          gchar * text = sanitize_label (GTK_LABEL (label));
+          dbusmenu_menuitem_property_set (mi, "label", text);
+          g_free (text);
 
-              pdata->label = label;
-              g_signal_connect (G_OBJECT (label),
-                                "notify",
-                                G_CALLBACK (label_notify_cb),
-                                mi);
-              g_object_add_weak_pointer(G_OBJECT (label), (gpointer*)&pdata->label);
-            }
+          pdata->label = label;
+          g_signal_connect (G_OBJECT (label),
+                            "notify",
+                            G_CALLBACK (label_notify_cb),
+                            mi);
+          g_object_add_weak_pointer(G_OBJECT (label), (gpointer*)&pdata->label);
 
           if (GTK_IS_ACTIVATABLE (widget))
             {
@@ -760,11 +757,48 @@
 }
 
 static void
+recreate_menu_item (DbusmenuMenuitem * parent, DbusmenuMenuitem * child)
+{
+  if (parent == NULL)
+    {
+      /* We need a parent */
+      return;
+    }
+  ParserData * pdata = g_object_get_data (G_OBJECT (child), PARSER_DATA);
+  /* Keep a pointer to the GtkMenuItem, as pdata->widget might be
+   * invalidated when we delete the DbusmenuMenuitem
+   */
+  GtkWidget * menuitem = pdata->widget;
+
+  dbusmenu_menuitem_child_delete (parent, child);
+
+  RecurseContext recurse = {0};
+  recurse.toplevel = gtk_widget_get_toplevel(menuitem);
+  recurse.parent = parent;
+
+  parse_menu_structure_helper(menuitem, &recurse);
+}
+
+static gboolean
+recreate_menu_item_in_idle_cb (gpointer data)
+{
+  DbusmenuMenuitem * child = (DbusmenuMenuitem *)data;
+  DbusmenuMenuitem * parent = dbusmenu_menuitem_get_parent (child);
+  g_object_unref (child);
+  recreate_menu_item (parent, child);
+  return FALSE;
+}
+
+static void
 label_notify_cb (GtkWidget  *widget,
                  GParamSpec *pspec,
                  gpointer    data)
 {
   DbusmenuMenuitem *child = (DbusmenuMenuitem *)data;
+  GValue prop_value = {0};
+
+  g_value_init (&prop_value, pspec->value_type); 
+  g_object_get_property (G_OBJECT (widget), pspec->name, &prop_value);
 
   if (pspec->name == g_intern_static_string ("label"))
     {
@@ -774,6 +808,24 @@
                                       text);
       g_free (text);
     }
+  else if (pspec->name == g_intern_static_string ("parent"))
+    {
+      if (GTK_WIDGET (g_value_get_object (&prop_value)) == NULL)
+        {
+          /* This label is being removed from its GtkMenuItem. The
+           * menuitem becomes a separator now. As the client doesn't handle
+           * changing types so well, we remove the current DbusmenuMenuitem
+           * and add a new one.
+           *
+           * Note, we have to defer this to idle, as we are called before
+           * bin->child member of our old parent is invalidated. If we go ahead
+           * and call parse_menu_structure_helper now, the GtkMenuItem will
+           * still appear to have a label and we never convert it to a separator
+           */
+          g_object_ref (child);
+          g_idle_add ((GSourceFunc)recreate_menu_item_in_idle_cb, child);
+        } 
+    }
 }
 
 static void
@@ -891,6 +943,20 @@
     }
   else if (pspec->name == g_intern_static_string ("label"))
     {
+      ParserData *pdata = g_object_get_data (G_OBJECT (child), PARSER_DATA);
+      if (!pdata->label)
+        {
+          /* GtkMenuItem's can start life as a separator if they have no child
+           * GtkLabel. In this case, we need to convert the DbusmenuMenuitem from
+           * a separator to a normal menuitem if the application adds a label.
+           * As changing types isn't handled too well by the client, we delete
+           * this menuitem for now and then recreate it
+           */
+          DbusmenuMenuitem * parent = dbusmenu_menuitem_get_parent (child);
+          recreate_menu_item (parent, child);
+          return;
+        }
+                      
       dbusmenu_menuitem_property_set (child,
                                       DBUSMENU_MENUITEM_PROP_LABEL,
                                       g_value_get_string (&prop_value));

=== modified file 'ltmain.sh'
--- ltmain.sh	2011-02-17 17:04:40 +0000
+++ ltmain.sh	2011-03-31 18:59:23 +0000
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu2
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu2"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
 package_revision=1.3017