DBus Menu

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

  1. lop-1082516
  2. Merge into trunk.13.04
Proposed by Charles Kerr
Status: Merged
Approved by: Allan LeSage
Approved revision: 435
Merged at revision: 434
Proposed branch: lp://qastaging/~charlesk/libdbusmenu/lop-1082516
Merge into: lp://qastaging/libdbusmenu/13.04
Diff against target: 12 lines (+1/-1)
1 file modified
libdbusmenu-gtk/client.c (+1/-1)
To merge this branch: bzr merge lp://qastaging/~charlesk/libdbusmenu/lop-1082516
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+136276@code.qastaging.launchpad.net

Commit message

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

Description of the change

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().

To post a comment you must log in.
lp://qastaging/~charlesk/libdbusmenu/lop-1082516 updated
435. By Charles Kerr

whoops! remove a stray g_message() that got committed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Charles Kerr (charlesk) wrote :

Whoo!

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: