~vcs-imports/gnome-settings-daemon/+git/gnome-settings-daemon:gnome-3-20

Last commit made on 2017-05-05
Get this branch:
git clone -b gnome-3-20 https://git.launchpad.net/~vcs-imports/gnome-settings-daemon/+git/gnome-settings-daemon

Branch merges

Branch information

Recent commits

74af410... by Jeremy BĂ­cha

Fix header in Spanish translation

ae6bfaf... by Bastien Nocera

media-keys: Disable rfkill keys handling

If we handle rfkill input keys without telling rfkill, we end up
handling those keys in gnome-settings-daemon, as well as in the kernel's
rfkill-input driver. As handling all the different keys would require
more work than possible in a stable release, we'll let rfkill-input
handle this, and lose the OSD for now.

https://bugzilla.gnome.org/show_bug.cgi?id=760517

bfb7255... by Rui Matos

media-keys: Handle binding grabs when there's already one pending

Since grabbing is asynchronous, we might end up with requests to grab
a binding combo while we already have a pending grab for that same
combo. If this happens, the last request should win, so keep track of
it to re-try when we get the reply for the pending grab.

https://bugzilla.gnome.org/show_bug.cgi?id=758302

6028195... by Rui Matos

media-keys: Avoid leaking grabbed bindings

If a binding definition changes again before we get the dbus reply for
the previous change we'd never ungrab the previous accel id.

https://bugzilla.gnome.org/show_bug.cgi?id=758302

faf93fa... by Rui Matos

media-keys: Avoid using free'd memory

If a MetaKey instance is removed from the array and free'd after we
call grab_media_key() but before the dbus reply comes in, we end up
writing over free'd memory (&key->accel_id).

https://bugzilla.gnome.org/show_bug.cgi?id=758302

4511392... by Rui Matos

media-keys: Reference count MediaKey struct instances

https://bugzilla.gnome.org/show_bug.cgi?id=758302

05ffa9a... by Rui Matos

media-keys: Avoid multiple grab/ungrab pairs on custom binding changes

If there are gsettings changes to a custom binding's gsettings we
could end up calling update_custom_binding() twice in a row: one for
the 'binding' setting and one for the 'command' setting. This means
that we would add the same binding twice and the second addition would
fail resulting in key->accel_id being set to 0, preventing us from
handling the binding when it gets activated.

Since we're only interested in changes to the 'binding' setting, we
can prevent this problem and the extra work we always do by ignoring
changes to any other setting keys.

Thanks to Matthijs Kooijman (<email address hidden>) for debugging and
pointing out the problem.

https://bugzilla.gnome.org/show_bug.cgi?id=758302

eb381b9... by Ray Strode <email address hidden>

smartcard: use NSS_InitContext instead of NSS_Initialize

NSS_Initialize is a noop if called multiple times. We
currently call NSS_Initialize twice in gnome-settings-daemon.
Once by NMClient and once by the smartcard plugin. NMClient
does it first, and it does it without initializing the secmod
database. When the smartcard plugin tries to initialize NSS
with the secmod database later, it's call is turned to a noop.

This commit changes the smartcard plugin to use NSS_InitContext
instead, which can properly handle being initialized multiple
times with different configurations. See:

https://wiki.mozilla.org/NSS_Library_Init

https://bugzilla.gnome.org/show_bug.cgi?id=751040

9c13eaf... by Bastien Nocera

media-keys: Fix shutdown dialog delay when using kbd shortcut

After pressing the Ctrl+Alt+Del shortcut, the shutdown dialog doesn't
appear on screen for a couple of seconds.

The media-keys daemon calls the 'Shutdown' method synchronously. After that
gnome-session calls the daemon with 'QueryEndSession'. The daemon cannot
reply as it's blocked waiting for the reply to the Shutdown method.

Sending the message asynchronously fixes that delay.

Based on report by Xiaoguang Wang <email address hidden>

https://bugzilla.gnome.org/show_bug.cgi?id=774452

44d0275... by Rui Matos

3.20.2