Merge lp:~charlesk/libdbusmenu/lop-1082516 into lp:libdbusmenu/13.04

[Charles Kerr]

Confirm that icon_name is non-NULL before passing it to gtk_icon_theme_has_icon()

Looks like the problem is coming from configuration #5 in test-gtk-label.json, specifically this entry:

 > {"id": 89,
 > "type": "standard",
 > "icon-name": "blank-icon",
 > "label": "blank"}

"blank-icon" is the magic string used by DBUSMENU_MENUITEM_ICON_NAME_BLANK, which in libdbusmenu-gtk/client.c is processed by image_property_handle() to give the menuitem a blank GtkImage.

In a subsequent call to image_property_handle() we call gtk_image_get_icon_name() on the existing image iff its storage type is GTK_IMAGE_ICON_NAME or GTK_IMAGE_EMPTY. This is legal use of that gtk function, but in the case listed above, the name that's returned is NULL, so we need to test for that before using icon_name elsewhere in image_property_handle().

[lp:~charlesk/libdbusmenu/lop-1082516]

435. By Charles Kerr on 2012-11-26

whoops! remove a stray g_message() that got committed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/9/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/9//rebuild/?

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Err, wow.. that's getting things a bit compilicated (re: jenkins).

The fix itself looks good, but there are still test failures: http://paste.ubuntu.com/1390284/

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/10/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/10//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/11/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/11//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:435
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=amd64/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/./build=pbuilder,distribution=quantal,flavor=i386/12/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/dbusmenu-ci/12//rebuild/?

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Whoo!

[Mathieu Trudel-Lapierre (cyphermox)]

Approving. Fix looks good per my test in sbuild; though there are further issues that need to be fixed.

review: Approve

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2012-10-24 14:50:13 +0000
+++ libdbusmenu-gtk/client.c	2012-11-26 21:48:20 +0000
@@ -1182,7 +1182,7 @@
 		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)) {
 			const gchar *icon_name = NULL;
 			gtk_image_get_icon_name (GTK_IMAGE(gtkimage), &icon_name, NULL);
-			if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), icon_name)) {
+			if ((icon_name != NULL) && gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), icon_name)) {
 				return;
 			}
 		}