Unity Settings Daemon

Merge lp:~seb128/unity-settings-daemon/backport-small-bugfixes into lp:unity-settings-daemon

  1. backport-small-bugfixes
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Approved by: Iain Lane
Approved revision: 4024
Merged at revision: 4025
Proposed branch: lp:~seb128/unity-settings-daemon/backport-small-bugfixes
Merge into: lp:unity-settings-daemon
Diff against target: 23 lines (+2/-0)
2 files modified
plugins/keyboard/gsd-keyboard-manager.c (+1/-0)
plugins/orientation/gsd-orientation-manager.c (+1/-0)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/backport-small-bugfixes
Reviewer Review Type Date Requested Status
Iain Lane Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+208816@code.launchpad.net

Commit message

Backport some small upstream bugfixes

Description of the change

Backport some small upstream bugfixes

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

Small fixes from upstream, apply numlock status to new keyboards when connected and clean a warning

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

(I droped the power changes, our version is slightly different from upstream and that's creating issue for a backport)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:4024
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/21/rebuild

review: Approve (continuous-integration)
Revision history for this message
Iain Lane (laney) wrote :

these are ok, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
2--- plugins/keyboard/gsd-keyboard-manager.c 2014-02-17 14:29:51 +0000
3+++ plugins/keyboard/gsd-keyboard-manager.c 2014-02-28 14:37:10 +0000
4@@ -1322,6 +1322,7 @@
5 source = gdk_device_get_source (device);
6 if (source == GDK_SOURCE_KEYBOARD) {
7 g_debug ("New keyboard plugged in, applying all settings");
8+ apply_numlock (manager);
9 apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
10 run_custom_command (device, COMMAND_DEVICE_ADDED);
11 }
12
13=== modified file 'plugins/orientation/gsd-orientation-manager.c'
14--- plugins/orientation/gsd-orientation-manager.c 2013-11-13 01:51:23 +0000
15+++ plugins/orientation/gsd-orientation-manager.c 2014-02-28 14:37:10 +0000
16@@ -487,6 +487,7 @@
17
18 gnome_settings_profile_start (NULL);
19
20+ manager->priv->start_idle_id = 0;
21 manager->priv->settings = g_settings_new (CONF_SCHEMA);
22 manager->priv->orientation_lock = g_settings_get_boolean (manager->priv->settings, ORIENTATION_LOCK_KEY);
23 g_signal_connect (G_OBJECT (manager->priv->settings), "changed::orientation-lock",

Subscribers

People subscribed via source and target branches