unity-2d

Merge lp:~osomon/unity-2d/launcher-super-key-enable into lp:unity-2d/3.0

  1. launcher-super-key-enable
  2. Merge into natty
Proposed by Olivier Tilloy
Status: Merged
Approved by: Bill Filler
Approved revision: 504
Merged at revision: 506
Proposed branch: lp:~osomon/unity-2d/launcher-super-key-enable
Merge into: lp:unity-2d/3.0
Diff against target: 23 lines (+2/-1)
2 files modified
debian/20_unity-2d-gconf-default (+1/-0)
launcher/app/launcherview.cpp (+1/-1)
To merge this branch: bzr merge lp:~osomon/unity-2d/launcher-super-key-enable
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
Review via email: mp+56108@code.launchpad.net

Commit message

[launcher] Renamed the GConf key that controls whether monitoring the super key is enabled to /desktop/unity-2d/launcher/super_key_enable.
Set it to true by default in the package.
The key was formerly shared between unity and unity-2d, but unity deprecated it in favour of a compiz setting.

To post a comment you must log in.
Revision history for this message
Bill Filler (bfiller) wrote :

This looks fine. One question though: do we not install a schema file for our keys? If not we probably should but that can be done as a separate bug.

review: Approve
Revision history for this message
Olivier Tilloy (osomon) wrote :

> This looks fine. One question though: do we not install a schema file for our
> keys? If not we probably should but that can be done as a separate bug.

We apparently don’t, and you’re right, we probably should. But that’s definitely a separate issue, I’ll file a bug report for it.

Revision history for this message
Bill Filler (bfiller) :
review: Approve
Revision history for this message
Olivier Tilloy (osomon) wrote :

> I’ll file a bug report for it.

Done: bug #750303.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/20_unity-2d-gconf-default'
2--- debian/20_unity-2d-gconf-default 2011-03-11 01:14:28 +0000
3+++ debian/20_unity-2d-gconf-default 2011-04-04 07:48:32 +0000
4@@ -3,6 +3,7 @@
5 /desktop/unity-2d/launcher/favorites [ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]
6 /desktop/unity-2d/launcher/hide_mode 2
7 /desktop/unity-2d/launcher/use_strut false
8+/desktop/unity-2d/launcher/super_key_enable true
9 /desktop/gnome/applications/window_manager/default /usr/bin/metacity
10 /desktop/gnome/applications/window_manager/current /usr/bin/metacity
11 /apps/metacity/general/show_maximized_titlebars false
12
13=== modified file 'launcher/app/launcherview.cpp'
14--- launcher/app/launcherview.cpp 2011-03-23 11:30:21 +0000
15+++ launcher/app/launcherview.cpp 2011-04-04 07:48:32 +0000
16@@ -59,7 +59,7 @@
17 connect(this, SIGNAL(superKeyTapped()), SLOT(toggleDash()));
18 connect(this, SIGNAL(superKeyHeldChanged(bool)), SLOT(changeKeyboardShortcutsState(bool)));
19
20- m_enableSuperKey.setKey("/desktop/unity/launcher/super_key_enable");
21+ m_enableSuperKey.setKey("/desktop/unity-2d/launcher/super_key_enable");
22 connect(&m_enableSuperKey, SIGNAL(valueChanged()), SLOT(updateSuperKeyMonitoring()));
23 updateSuperKeyMonitoring();
24

Subscribers

People subscribed via source and target branches