releasing version 0.3.99-0ubuntu4

4 files changed, 56 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 74b174e..9029486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdbusmenu (0.3.99-0ubuntu4) natty; urgency=low
+
+  * Fix a warning in gedit
+    - update debian/patches/fix-defaults-in-client.patch
+  * Fix missing submenus in bluetooth-applet
+    - add debian/patches/bluetooth-applet-fix.patch
+    - update debian/patches/series
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 01 Mar 2011 15:13:00 +0000
+
 libdbusmenu (0.3.99-0ubuntu3) natty; urgency=low
 
   * Fix LP: #723873 - ensure that changing a menuitem property to a default
diff --git a/debian/patches/bluetooth-applet-fix.patch b/debian/patches/bluetooth-applet-fix.patch
new file mode 100644
index 0000000..34e0e48
--- /dev/null
+++ b/debian/patches/bluetooth-applet-fix.patch
@@ -0,0 +1,20 @@
+--- a/libdbusmenu-gtk/parser.c
++++ b/libdbusmenu-gtk/parser.c
+@@ -456,6 +456,17 @@ construct_dbusmenu_for_widget (GtkWidget
+                 }
+             }
+ 
++          GtkWidget *submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
++          if (submenu)
++            {
++              pdata->shell = submenu;
++              g_signal_connect (G_OBJECT (submenu),
++                                "child-added",
++                                G_CALLBACK (child_added_cb),
++                                mi);
++              g_object_add_weak_pointer(G_OBJECT(submenu), (gpointer*)&pdata->shell);
++            }
++
+           if (!g_object_get_data (G_OBJECT (widget), "gtk-empty-menu-item") && !GTK_IS_TEAROFF_MENU_ITEM (widget))
+             {
+               visible = gtk_widget_get_visible (widget);
diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch
index a299b32..8e422db 100644
--- a/debian/patches/fix-defaults-in-client.patch
+++ b/debian/patches/fix-defaults-in-client.patch
@@ -1,21 +1,18 @@
-=== modified file 'libdbusmenu-glib/menuitem.c'
-Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
-===================================================================
---- libdbusmenu-0.3.99.orig/libdbusmenu-glib/menuitem.c	2011-02-25 03:30:16 +0000
-+++ libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c	2011-02-28 22:51:34 +0000
-@@ -1150,9 +1150,9 @@
+--- a/libdbusmenu-glib/menuitem.c
++++ b/libdbusmenu-glib/menuitem.c
+@@ -1150,9 +1150,9 @@ dbusmenu_menuitem_property_set_variant (
  	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
  	GVariant * default_value = NULL;
  
-+	const gchar * type = menuitem_get_type(mi);
-+
- 	if (value != NULL) {
+-	if (value != NULL) {
 -		const gchar * type = menuitem_get_type(mi);
--
++	const gchar * type = menuitem_get_type(mi);
+ 
++	if (value != NULL) {
  		/* Check the expected type to see if we want to have a warning */
  		GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property);
  		if (default_type != NULL) {
-@@ -1163,22 +1163,23 @@
+@@ -1163,22 +1163,23 @@ dbusmenu_menuitem_property_set_variant (
  				g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type));
  			}
  		}
@@ -51,7 +48,7 @@ Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
  	gboolean replaced = FALSE;
  	gpointer currentval = g_hash_table_lookup(priv->properties, property);
  
-@@ -1371,9 +1372,7 @@
+@@ -1371,9 +1372,7 @@ dbusmenu_menuitem_property_remove (Dbusm
  	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
  	g_return_if_fail(property != NULL);
  
@@ -62,4 +59,19 @@ Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c
  
  	return;
  }
-
+@@ -1753,13 +1752,8 @@ dbusmenu_menuitem_property_is_default (D
+ 		return FALSE;
+ 	}
+ 
+-	currentval = dbusmenu_defaults_default_get(priv->defaults, menuitem_get_type(mi), property);
+-	if (currentval != NULL) {
+-		return TRUE;
+-	}
+-
+-	g_warn_if_reached();
+-	return FALSE;
++	/* If we haven't stored it locally, then it's the default */
++	return TRUE;
+ }
+ 
+ /* Check to see if this menu item has been sent into the bus yet or
diff --git a/debian/patches/series b/debian/patches/series
index ab2b338..6be76c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disconnect-more-signals.patch
 fix-defaults-in-client.patch
+bluetooth-applet-fix.patch