Merge lp:~pete-woods/gmenuharness/fix-radio-button-activation into lp:gmenuharness

Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 31
Merged at revision: 30
Proposed branch: lp:~pete-woods/gmenuharness/fix-radio-button-activation
Merge into: lp:gmenuharness
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+6/-0)
src/MenuItemMatcher.cpp (+2/-1)
To merge this branch: bzr merge lp:~pete-woods/gmenuharness/fix-radio-button-activation
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+312040@code.launchpad.net

Commit message

Fix radio button activation

Description of the change

Fix radio button activation

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
Revision history for this message
Charles Kerr (charlesk) wrote :

Other than the whitespace LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-11-09 11:46:31 +0000
+++ debian/changelog 2016-12-02 11:36:43 +0000
@@ -1,3 +1,9 @@
1gmenuharness (0.1.2-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Fix action activation for radio buttons.
4
5 -- Pete <pete.woods@canonical.com> Tue, 29 Nov 2016 12:09:32 +0000
6
1gmenuharness (0.1.1+17.04.20161109.1-0ubuntu1) zesty; urgency=medium7gmenuharness (0.1.1+17.04.20161109.1-0ubuntu1) zesty; urgency=medium
28
3 * Improve test stability. Fix FTBFS on Zesty by reusing Xenial symbols9 * Improve test stability. Fix FTBFS on Zesty by reusing Xenial symbols
410
=== modified file 'src/MenuItemMatcher.cpp'
--- src/MenuItemMatcher.cpp 2016-06-01 09:57:11 +0000
+++ src/MenuItemMatcher.cpp 2016-12-02 11:36:43 +0000
@@ -1017,7 +1017,8 @@
1017 }1017 }
1018 else1018 else
1019 {1019 {
1020 g_action_group_activate_action(tmpActionGroup.get(), tmpIdPair.second.c_str(), nullptr);1020 auto actionTarget = get_attribute(menuItem, G_MENU_ATTRIBUTE_TARGET);
1021 g_action_group_activate_action(tmpActionGroup.get(), tmpIdPair.second.c_str(), actionTarget.get());
1021 }1022 }
10221023
1023 // FIXME this is a dodgy way to ensure the activation gets dispatched1024 // FIXME this is a dodgy way to ensure the activation gets dispatched

Subscribers

People subscribed via source and target branches