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

[Ted Gould]

0.2.8

[Ken VanDine (ken-vandine)]

Approved!

review: Approve

[Ken VanDine (ken-vandine)]

Manually merged changes into lp:ubuntu/libdbusmenu (will be there after it gets sponsored)

=== modified file 'configure.ac'
--- configure.ac	2010-03-04 17:12:16 +0000
+++ configure.ac	2010-03-25 15:21:37 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 0.2.7, [e-mail])
+AC_INIT(libdbusmenu, 0.2.8, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.2.7, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 0.2.8, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
@@ -78,7 +78,7 @@
 ###########################
 
 LIBDBUSMENU_CURRENT=1
-LIBDBUSMENU_REVISION=4
+LIBDBUSMENU_REVISION=5
 LIBDBUSMENU_AGE=0
 
 AC_SUBST(LIBDBUSMENU_CURRENT)

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-04 19:31:31 +0000
+++ debian/changelog	2010-03-25 15:21:37 +0000
@@ -1,3 +1,12 @@
+libdbusmenu (0.2.8-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.2.8
+    * Adding support for blank icons (LP: #534854)
+    * Remove unneeded warning (LP: #537312)
+    * Fix typo in documentation
+
+ -- Ted Gould <[e-mail]>  Thu, 25 Mar 2010 10:12:27 -0500
+
 libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.7

=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2010-02-08 22:02:12 +0000
+++ libdbusmenu-glib/menuitem.c	2010-03-25 15:21:37 +0000
@@ -459,7 +459,7 @@
 
 	While the name sounds devious that's exactly what this function
 	does.  It takes the list of children from the @mi and clears the
-	internal list.  The calling function is no in charge of the ref's
+	internal list.  The calling function is now in charge of the ref's
 	on the children it has taken.  A lot of responsibility involved
 	in taking children.
 

=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h	2010-02-05 18:48:48 +0000
+++ libdbusmenu-glib/menuitem.h	2010-03-25 15:21:37 +0000
@@ -66,6 +66,8 @@
 #define DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED       1
 #define DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN       -1
 
+#define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
+
 /**
 	DbusmenuMenuitem:
 

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2010-02-04 18:56:49 +0000
+++ libdbusmenu-gtk/client.c	2010-03-25 15:21:37 +0000
@@ -411,7 +411,6 @@
 
 	gpointer data = g_object_get_data(G_OBJECT(item), data_menuitem);
 	if (data == NULL) {
-		g_warning("GTK not updated");
 		return NULL;
 	}
 
@@ -513,7 +512,7 @@
 	if (!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA)) {
 		/* If we have an image already built from a name that is
 		   way better than a pixbuf.  Keep it. */
-		if (gtkimage != NULL && gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_ICON_NAME) {
+		if (gtkimage != NULL && (gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_ICON_NAME || gtk_image_get_storage_type(GTK_IMAGE(gtkimage)) == GTK_IMAGE_EMPTY)) {
 			return;
 		}
 	}
@@ -525,6 +524,8 @@
 			/* If there is no name, by golly we want no
 			   icon either. */
 			gtkimage = NULL;
+		} else if (g_strcmp0(iconname, DBUSMENU_MENUITEM_ICON_NAME_BLANK) == 0) {
+			gtkimage = gtk_image_new();
 		} else {
 			/* Look to see if we want to have an icon with the 'ltr' or
 			   'rtl' depending on what we're doing. */
@@ -584,6 +585,14 @@
 
 	}
 
+	if (gtkimage != NULL) {
+		gint width, height;
+		gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
+
+		gtk_widget_set_size_request(GTK_WIDGET(gtkimage), width, height);
+		gtk_misc_set_alignment(GTK_MISC(gtkimage), 0.0, 0.5);
+	}
+
 	genericmenuitem_set_image(GENERICMENUITEM(gimi), gtkimage);
 
 	return;

=== modified file 'tests/test-gtk-label.json'
--- tests/test-gtk-label.json	2010-02-05 17:53:19 +0000
+++ tests/test-gtk-label.json	2010-03-25 15:21:37 +0000
@@ -242,8 +242,8 @@
 		 "label": "sad"},
 	 	{"id": 89,
 		 "type": "standard",
-		 "icon-name": "face-sick",
-		 "label": "sick"}
+		 "icon-name": "blank-icon",
+		 "label": "blank"}
 	 ]
 	},
 	{"id": 9, "type": "standard",