Merge lp://qastaging/~mardy/libdbusmenu/lp937829 into lp://qastaging/libdbusmenu/0.6

Proposed by Alberto Mardegan
Status: Merged
Approved by: Ted Gould
Approved revision: 376
Merged at revision: 375
Proposed branch: lp://qastaging/~mardy/libdbusmenu/lp937829
Merge into: lp://qastaging/libdbusmenu/0.6
Diff against target: 82 lines (+14/-19)
2 files modified
libdbusmenu-gtk/genericmenuitem.c (+13/-19)
tests/test-gtk-submenu-server.c (+1/-0)
To merge this branch: bzr merge lp://qastaging/~mardy/libdbusmenu/lp937829
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
DBus Menu Team Pending
Review via email: mp+94111@code.qastaging.launchpad.net

Commit message

Do not read the label text from the label widget

The label text stored in the widget might have been modified with markup.
Instead of reading it back from the widget, return the text as set by the
client, unmodified.

Alter the test-gtk-submenu so that the correct behaviour is checked for.

Description of the change

Do not read the label text from the label widget

The label text stored in the widget might have been modified with markup.
Instead of reading it back from the widget, return the text as set by the
client, unmodified.

Alter the test-gtk-submenu so that the correct behaviour is checked for.

To post a comment you must log in.
376. By Alberto Mardegan

Do not leak the label text

Also, fix the indentation from the previous commit.

Revision history for this message
Ted Gould (ted) wrote :

Works for me!

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