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

[Stephen M. Webb]

Use COMPIZ_METAKEY where needed.

Use COMPIZ_METAKEY where needed.

Cherry-picked from Unity trunk.

[Christopher Townsend (townsend)]

Ok

review: Approve

=== modified file 'shortcuts/CompizShortcutModeller.cpp'
--- shortcuts/CompizShortcutModeller.cpp	2014-03-04 18:35:10 +0000
+++ shortcuts/CompizShortcutModeller.cpp	2015-03-11 21:04:44 +0000
@@ -283,13 +283,13 @@
 
   hints.push_back(std::make_shared<shortcut::Hint>(workspaces, "", _(" + Arrow Keys"),
                                                    _("Switches workspaces."),
-                                                   shortcut::OptionType::COMPIZ_KEY,
+                                                   shortcut::OptionType::COMPIZ_METAKEY,
                                                    WALL_PLUGIN_NAME,
                                                    WALL_OPTION_LEFT_KEY));
 
   hints.push_back(std::make_shared<shortcut::Hint>(workspaces, "", _(" + Arrow Keys"),
                                                    _("Moves focused window to another workspace."),
-                                                   shortcut::OptionType::COMPIZ_KEY,
+                                                   shortcut::OptionType::COMPIZ_METAKEY,
                                                    WALL_PLUGIN_NAME,
                                                    WALL_OPTION_LEFT_WINDOW_KEY));
 }