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

[Ted Gould]

Last one!

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

144. By Ken VanDine on 2011-04-14

releasing version 0.4.3-0ubuntu1

=== modified file 'ChangeLog'
--- ChangeLog	2011-04-07 15:24:32 +0000
+++ ChangeLog	2011-04-14 21:52:53 +0000
@@ -1,5 +1,61 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.4.3
+
[phone]  Ted Gould  <[e-mail]>
+
+	Handle cases of labels being added later
+
[phone]  Michael Terry  <[e-mail]>
+
+	watch empty/separator menu items for any added GtkLabel children, as gnome-commander likes to do
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the cleanup of GTK Menuitems to avoid undefined references.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensuring all the menus are hidden before unref'ing root
+
[phone]  Ted Gould  <[e-mail]>
+
+	Passing the menuitem instead of finding it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Protecting the label with the null check and don't unref something that shouldn't be.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attaching the data in a way that it'll cleanup itself
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attaching bug
+
[phone]  Ted Gould  <[e-mail]>
+
+	We have to destroy, why?  Because we want to make sure that the menu having a ref doesn't block us from getting rid of the item.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the reference to the GTK Menuitem to be a _sink as well as using set_data_full() instead of a weak ref for unref'ing it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensure that we gaurantee the open/clicked/closed event ordering.
+
[phone]  Michael Terry  <[e-mail]>
+
+	guard against an activation that does not actually have an associated menu-hide
+
[phone]  Michael Terry  <[e-mail]>
+
+	force activated event to be sandwiched by opened/closed events
+
 2011-04-07  Ted Gould  <[e-mail]>
 
 	0.4.2
 
=== modified file 'configure'
--- configure	2011-04-07 15:26:05 +0000
+++ configure	2011-04-14 21:52:53 +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.2.
+# Generated by GNU Autoconf 2.67 for libdbusmenu 0.4.3.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -703,8 +703,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdbusmenu'
 PACKAGE_TARNAME='libdbusmenu'
-PACKAGE_VERSION='0.4.2'
-PACKAGE_STRING='libdbusmenu 0.4.2'
+PACKAGE_VERSION='0.4.3'
+PACKAGE_STRING='libdbusmenu 0.4.3'
 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.2 to adapt to many kinds of systems.
+\`configure' configures libdbusmenu 0.4.3 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.2:";;
+     short | recursive ) echo "Configuration of libdbusmenu 0.4.3:";;
    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.2
+libdbusmenu configure 0.4.3
 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.2, which was
+It was created by libdbusmenu $as_me 0.4.3, 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.2
+ VERSION=0.4.3
 
 
 # Some tools Automake needs.
@@ -13294,7 +13294,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=13
+LIBDBUSMENU_REVISION=14
 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.2, which was
+This file was extended by libdbusmenu $as_me 0.4.3, 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.2
+libdbusmenu config.status 0.4.3
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-07 15:26:05 +0000
+++ configure.ac	2011-04-14 21:52:53 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.4.2, [e-mail])
+AC_INIT(libdbusmenu, 0.4.3, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.4.2, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.4.3, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -134,7 +134,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=3
-LIBDBUSMENU_REVISION=13
+LIBDBUSMENU_REVISION=14
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-04-14 13:30:12 +0000
+++ debian/changelog	2011-04-14 21:52:53 +0000
@@ -1,5 +1,6 @@
-libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low
+libdbusmenu (0.4.3-0ubuntu1~ppa1) natty; urgency=low
 
+  [ Ken VanDine ]
   * debian/rules
     - Fixed package names in build targets (LP: #760102)
     - Dropped makeshlibs in favor of symbols files
@@ -7,7 +8,15 @@
   * +debian/libdbusmenu-gtk3-3.symbols
   * +debian/libdbusmenu-gtk3.symbols
 
- -- Ken VanDine <[e-mail]>  Thu, 14 Apr 2011 09:27:03 -0400
+  [ Ted Gould ]
+  * New upstream release.
+    ∘ Handle cases where labels are added later as subwidgets
+      in the menuitem (LP: #758759)
+    ∘ Fix the destruction of the attached GTK menuitem (LP: #746091)
+    ∘ Guard against an activation that does not actually have an
+      associated menu-hide (LP: #750588)
+
+ -- Ted Gould <[e-mail]>  Thu, 14 Apr 2011 16:49:13 -0500
 
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
 
=== modified file 'docs/libdbusmenu-glib/reference/html/ch01.html'
--- docs/libdbusmenu-glib/reference/html/ch01.html	2011-04-07 15:24:32 +0000
+++ docs/libdbusmenu-glib/reference/html/ch01.html	2011-04-14 21:52:53 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id552681"></a>API</h2></div></div></div>
+<a name="id540461"></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-04-07 15:26:05 +0000
+++ docs/libdbusmenu-glib/reference/version.xml	2011-04-14 21:52:53 +0000
@@ -1,1 +1,1 @@
-0.4.2
+0.4.3
 
=== modified file 'docs/libdbusmenu-gtk/reference/html/ch01.html'
--- docs/libdbusmenu-gtk/reference/html/ch01.html	2011-04-07 15:24:32 +0000
+++ docs/libdbusmenu-gtk/reference/html/ch01.html	2011-04-14 21:52:53 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id463422"></a>API</h2></div></div></div>
+<a name="id403245"></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-04-07 15:26:05 +0000
+++ docs/libdbusmenu-gtk/reference/version.xml	2011-04-14 21:52:53 +0000
@@ -1,1 +1,1 @@
-0.4.2
+0.4.3
 
=== modified file 'libdbusmenu-glib/client-menuitem.c'
--- libdbusmenu-glib/client-menuitem.c	2011-02-21 18:55:10 +0000
+++ libdbusmenu-glib/client-menuitem.c	2011-04-14 21:52:53 +0000
@@ -106,7 +106,7 @@
 handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	DbusmenuClientMenuitemPrivate * priv = DBUSMENU_CLIENT_MENUITEM_GET_PRIVATE(mi);
-	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp);
+	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp, mi);
 	return;
 }
 
 
=== modified file 'libdbusmenu-glib/client-private.h'
--- libdbusmenu-glib/client-private.h	2011-02-21 18:55:10 +0000
+++ libdbusmenu-glib/client-private.h	2011-04-14 21:52:53 +0000
@@ -37,7 +37,8 @@
                                                         gint id,
                                                         const gchar * name,
                                                         GVariant * variant,
-                                                        guint timestamp);
+                                                        guint timestamp,
+                                                        DbusmenuMenuitem * mi);
 void                 dbusmenu_client_send_about_to_show(DbusmenuClient * client,
                                                         gint id,
                                                         void (*cb) (gpointer user_data),
 
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-04-07 15:26:05 +0000
+++ libdbusmenu-glib/client.c	2011-04-14 21:52:53 +0000
@@ -1516,14 +1516,13 @@
 /* Sends the event over DBus to the server on the other side
    of the bus. */
 void
-dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp)
+dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp, DbusmenuMenuitem * mi)
 {
 	g_return_if_fail(DBUSMENU_IS_CLIENT(client));
 	g_return_if_fail(id >= 0);
 	g_return_if_fail(name != NULL);
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 	if (mi == NULL) {
 		g_warning("Asked to activate a menuitem %d that we don't know about", id);
 		return;
 
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2011-04-08 21:23:37 +0000
+++ libdbusmenu-gtk/client.c	2011-04-14 21:52:53 +0000
@@ -690,7 +690,8 @@
 	} else {
 		/* We need to build a menu for these guys to live in. */
 		GtkMenu * menu = GTK_MENU(gtk_menu_new());
-		g_object_set_data(G_OBJECT(mi), data_menu, menu);
+		g_object_ref_sink(menu);
+		g_object_set_data_full(G_OBJECT(mi), data_menu, menu, g_object_unref);
 
 		gtk_menu_item_set_submenu(gmi, GTK_WIDGET(menu));
 
@@ -735,19 +736,6 @@
 	return;
 }
 
-/* Call back that happens when the DbusmenuMenuitem
-   is destroyed.  We're making sure to clean up everything
-   else down the pipe. */
-static void
-destoryed_dbusmenuitem_cb (gpointer udata, GObject * dbusmenuitem)
-{
-	#ifdef MASSIVEDEBUGGING
-	g_debug("DbusmenuMenuitem was destroyed");
-	#endif
-	gtk_widget_destroy(GTK_WIDGET(udata));
-	return;
-}
-
 /* The new menuitem signal only happens if we don't have a type handler
    for the type of the item.  This should be an error condition and we're
    printing out a message. */
@@ -850,11 +838,8 @@
 	#endif
 
 	/* Attach these two */
-	g_object_set_data(G_OBJECT(item), data_menuitem, gmi);
-	g_object_ref(G_OBJECT(gmi));
-	#ifdef MASSIVEDEBUGGING
-	g_signal_connect(G_OBJECT(gmi), "destroy", G_CALLBACK(destroy_gmi), item);
-	#endif
+	g_object_ref_sink(G_OBJECT(gmi));
+	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)gtk_widget_destroy);
 
 	/* DbusmenuMenuitem signals */
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
@@ -865,9 +850,6 @@
 	/* GtkMenuitem signals */
 	g_signal_connect(G_OBJECT(gmi), "activate", G_CALLBACK(menu_pressed_cb), item);
 
-	/* Life insurance */
-	g_object_weak_ref(G_OBJECT(item), destoryed_dbusmenuitem_cb, gmi);
-
 	/* Check our set of props to see if any are set already */
 	process_visible(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_VISIBLE));
 	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ENABLED));
@@ -920,7 +902,7 @@
 
 		if (menu != NULL) {
 			gtk_widget_destroy(GTK_WIDGET(menu));
-			g_object_set_data(G_OBJECT(mi), data_menu, NULL);
+			g_object_steal_data(G_OBJECT(mi), data_menu);
 		}
 	}
 
@@ -1024,11 +1006,10 @@
 
 	GtkMenuItem * gmi;
 	gmi = GTK_MENU_ITEM(g_object_new(GENERICMENUITEM_TYPE, NULL));
-	gtk_menu_item_set_label(gmi, dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL));
 
 	if (gmi != NULL) {
+		gtk_menu_item_set_label(gmi, dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL));
 		dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
-		g_object_unref(gmi);
 	} else {
 		return FALSE;
 	}
 
=== modified file 'libdbusmenu-gtk/menu.c'
--- libdbusmenu-gtk/menu.c	2011-02-21 20:13:29 +0000
+++ libdbusmenu-gtk/menu.c	2011-04-14 21:52:53 +0000
@@ -329,6 +329,18 @@
 	return;
 }
 
+/* Handler for all of the menu items on a root change to ensure that
+   the menus are hidden before we start going and deleting things. */
+static void
+popdown_all (DbusmenuMenuitem * mi, gpointer user_data)
+{
+	GtkMenu * menu = dbusmenu_gtkclient_menuitem_get_submenu(DBUSMENU_GTKCLIENT(user_data), mi);
+	if (menu != NULL) {
+		gtk_menu_popdown(menu);
+	}
+	return;
+}
+
 /* When the root menuitem changes we need to resetup things so that
    we're back in the game. */
 static void
@@ -344,6 +356,8 @@
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->root), root_child_moved, menu);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->root), root_child_delete, menu);
 
+		dbusmenu_menuitem_foreach(priv->root, popdown_all, client);
+
 		g_object_unref(priv->root);
 		priv->root = NULL;
 	}
 
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-04-05 21:20:54 +0000
+++ libdbusmenu-gtk/parser.c	2011-04-14 21:52:53 +0000
@@ -87,6 +87,9 @@
 static void           widget_notify_cb         (GtkWidget  *        widget,
                                                 GParamSpec *        pspec,
                                                 gpointer            data);
+static void           widget_add_cb            (GtkWidget *         widget,
+                                                GtkWidget *         child,
+                                                gpointer            data);
 static gboolean       should_show_image        (GtkImage *          image);
 static void           menuitem_notify_cb       (GtkWidget *         widget,
                                                 GParamSpec *        pspec,
@@ -169,6 +172,8 @@
 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
 						     0, 0, NULL, G_CALLBACK(widget_notify_cb), NULL);
 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
+						     0, 0, NULL, G_CALLBACK(widget_add_cb), NULL);
+		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
 						     0, 0, NULL, G_CALLBACK(accel_changed), NULL);
 		g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC,
 						     0, 0, NULL, G_CALLBACK(checkbox_toggled), NULL);
@@ -462,8 +467,8 @@
       if (GTK_IS_SEPARATOR_MENU_ITEM (widget) || !find_menu_label (widget))
         {
           dbusmenu_menuitem_property_set (mi,
-                                          "type",
-                                          "separator");
+                                          DBUSMENU_MENUITEM_PROP_TYPE,
+                                          DBUSMENU_CLIENT_TYPES_SEPARATOR);
 
           visible = gtk_widget_get_visible (widget);
           sensitive = gtk_widget_get_sensitive (widget);
@@ -605,6 +610,11 @@
                         G_CALLBACK (widget_notify_cb),
                         mi);
 
+      g_signal_connect (widget,
+                        "add",
+                        G_CALLBACK (widget_add_cb),
+                        mi);
+
       return mi;
     }
 
@@ -962,6 +972,26 @@
   return FALSE; // just pass through on everything
 }
 
+static gboolean
+handle_first_label (DbusmenuMenuitem *mi)
+{
+  ParserData *pdata = g_object_get_data (G_OBJECT (mi), 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 (mi);
+      recreate_menu_item (parent, mi);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static void
 widget_notify_cb (GtkWidget  *widget,
                   GParamSpec *pspec,
@@ -981,20 +1011,11 @@
     }
   else if (pspec->name == g_intern_static_string ("label"))
     {
-      ParserData *pdata = g_object_get_data (G_OBJECT (child), PARSER_DATA);
-      if (!pdata->label)
+      if (handle_first_label (child))
         {
-          /* 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));
@@ -1066,6 +1087,15 @@
   g_value_unset (&prop_value);
 }
 
+static void
+widget_add_cb (GtkWidget *widget,
+               GtkWidget *child,
+               gpointer   data)
+{
+  if (find_menu_label (child) != NULL)
+    handle_first_label (data);
+}
+
 /* A child item was added to a menu we're watching.  Let's try to integrate it. */
 static void
 child_added_cb (GtkContainer *menu, GtkWidget *widget, gpointer data)