Unity

Merge lp:~bregma/unity/lp-1413411-trusty into lp:unity/7.2

  1. lp-1413411-trusty
  2. Merge into trusty
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3812
Proposed branch: lp:~bregma/unity/lp-1413411-trusty
Merge into: lp:unity/7.2
Diff against target: 23 lines (+2/-0)
2 files modified
launcher/VolumeLauncherIcon.cpp (+1/-0)
tests/test_volume_launcher_icon.cpp (+1/-0)
To merge this branch: bzr merge lp:~bregma/unity/lp-1413411-trusty
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
Review via email: mp+252646@code.launchpad.net

Commit message

disabled markup for VolumeLauncherIcon quicklist menu items

Description of the change

Disables markup accel for VolumeLauncherIcon quicklist menu items.

Cherry-picked from trunk.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Alright

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/VolumeLauncherIcon.cpp'
2--- launcher/VolumeLauncherIcon.cpp 2014-04-16 01:24:47 +0000
3+++ launcher/VolumeLauncherIcon.cpp 2015-03-11 19:34:43 +0000
4@@ -220,6 +220,7 @@
5 dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
6 dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
7 dbusmenu_menuitem_property_set_bool(menu_item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY, true);
8+ dbusmenu_menuitem_property_set_bool(menu_item, QuicklistMenuItem::MARKUP_ACCEL_DISABLED_PROPERTY, true);
9
10 gsignals_.Add(new ItemSignal(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, [this] (DbusmenuMenuitem*, unsigned timestamp) {
11 OpenInFileManager(timestamp);
12
13=== modified file 'tests/test_volume_launcher_icon.cpp'
14--- tests/test_volume_launcher_icon.cpp 2014-03-21 04:40:12 +0000
15+++ tests/test_volume_launcher_icon.cpp 2015-03-11 19:34:43 +0000
16@@ -311,6 +311,7 @@
17 EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE));
18 EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, DBUSMENU_MENUITEM_PROP_ENABLED));
19 EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY));
20+ EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, QuicklistMenuItem::MARKUP_ACCEL_DISABLED_PROPERTY));
21
22 uint64_t time = g_random_int();
23 ON_CALL(*volume_, IsMounted()).WillByDefault(Return(false));

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: