Unity Settings Daemon

Merge lp:~noskcaj/unity-settings-daemon/micmute into lp:unity-settings-daemon

  1. micmute
  2. Merge into trunk
Proposed by Jackson Doak
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4032
Merged at revision: 4032
Proposed branch: lp:~noskcaj/unity-settings-daemon/micmute
Merge into: lp:unity-settings-daemon
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/media-keys/shortcuts-list.h (+1/-0)
To merge this branch: bzr merge lp:~noskcaj/unity-settings-daemon/micmute
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+210969@code.launchpad.net

Commit message

define XF86AudioMicMute as a mic mute key

Description of the change

Add a patch from git for ubuntu-gnome

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, what do you mean "for ubuntu-gnome"? The GNOME remix uses gnome-settings-daemon, not unity-settings-daemon

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Jackson, could you reply to the question?

Revision history for this message
Sebastien Bacher (seb128) wrote :

Jackson?

Revision history for this message
Jackson Doak (noskcaj) wrote :

Oh, sorry. That was just because i'd copied the description from my other merge request.

Revision history for this message
Sebastien Bacher (seb128) wrote :

Ok, thanks ;-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/media-keys/shortcuts-list.h'
2--- plugins/media-keys/shortcuts-list.h 2014-02-17 14:29:51 +0000
3+++ plugins/media-keys/shortcuts-list.h 2014-03-14 06:32:22 +0000
4@@ -117,6 +117,7 @@
5 { VOLUME_DOWN_KEY, "volume-down", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
6 { VOLUME_UP_KEY, "volume-up", NULL, NULL, SHELL_KEYBINDING_MODE_ALL },
7 { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "F20", SHELL_KEYBINDING_MODE_ALL },
8+ { MIC_MUTE_KEY, NULL, N_("Microphone Mute"), "XF86AudioMicMute", SHELL_KEYBINDING_MODE_ALL },
9 { MUTE_QUIET_KEY, NULL, N_("Quiet Volume Mute"), "<Alt>XF86AudioMute", SHELL_KEYBINDING_MODE_ALL },
10 { VOLUME_DOWN_QUIET_KEY, NULL, N_("Quiet Volume Down"), "<Alt>XF86AudioLowerVolume", SHELL_KEYBINDING_MODE_ALL },
11 { VOLUME_UP_QUIET_KEY, NULL, N_("Quiet Volume Up"), "<Alt>XF86AudioRaiseVolume", SHELL_KEYBINDING_MODE_ALL },

Subscribers

People subscribed via source and target branches