Merge lp:~seb128/unity-settings-daemon/xsettings-fixes-backport into lp:unity-settings-daemon

Proposed by Sebastien Bacher on 2015-10-07
Status: Merged
Approved by: Iain Lane on 2015-10-07
Approved revision: 4106
Merged at revision: 4101
Proposed branch: lp:~seb128/unity-settings-daemon/xsettings-fixes-backport
Merge into: lp:unity-settings-daemon
Diff against target: 91 lines (+7/-19)
3 files modified
plugins/xsettings/README.xsettings (+1/-1)
plugins/xsettings/gsd-xsettings-gtk.c (+1/-1)
plugins/xsettings/gsd-xsettings-manager.c (+5/-17)
To merge this branch: bzr merge lp:~seb128/unity-settings-daemon/xsettings-fixes-backport
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2015-10-08
Iain Lane 2015-10-07 Approve on 2015-10-07
Review via email: mp+273710@code.launchpad.net

Commit message

[xsettings] backport some small fixes from upstream, should fix issues where settings changes are delayed

Description of the change

[xsettings] backport some small fixes from upstream, should fix issues where settings changes are delayed

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

that should help with bug #1359211

Iain Lane (laney) wrote :

yep

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote :

Works fine!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xsettings/README.xsettings'
2--- plugins/xsettings/README.xsettings 2012-03-10 16:07:59 +0000
3+++ plugins/xsettings/README.xsettings 2015-10-07 15:23:01 +0000
4@@ -27,7 +27,7 @@
5 An example setting for this key (as expressed in GVariant text format)
6 might be:
7
8- { 'Gtk/ShellShowsAppMenu': < 0 >, 'Xft/DPI', < 98304 > }
9+ { 'Gtk/ShellShowsAppMenu': < 0 >, 'Xft/DPI': < 98304 > }
10
11 Noting that variants must be specified in the usual way (wrapped in <>).
12
13
14=== modified file 'plugins/xsettings/gsd-xsettings-gtk.c'
15--- plugins/xsettings/gsd-xsettings-gtk.c 2012-05-30 10:12:52 +0000
16+++ plugins/xsettings/gsd-xsettings-gtk.c 2015-10-07 15:23:01 +0000
17@@ -122,7 +122,6 @@
18 key = g_key_file_get_string (keyfile, "GTK Module", "X-GTK-Module-Enabled-Key", NULL);
19
20 settings = g_settings_new (schema);
21- enabled = g_settings_get_boolean (settings, key);
22
23 gtk->priv->cond_settings = g_list_prepend (gtk->priv->cond_settings, settings);
24
25@@ -130,6 +129,7 @@
26
27 signal = g_strdup_printf ("changed::%s", key);
28 g_signal_connect_object (G_OBJECT (settings), signal, G_CALLBACK (cond_setting_changed), gtk, 0);
29+ enabled = g_settings_get_boolean (settings, key);
30 g_free (signal);
31 g_free (schema);
32 g_free (key);
33
34=== modified file 'plugins/xsettings/gsd-xsettings-manager.c'
35--- plugins/xsettings/gsd-xsettings-manager.c 2015-10-01 02:42:18 +0000
36+++ plugins/xsettings/gsd-xsettings-manager.c 2015-10-07 15:23:01 +0000
37@@ -660,6 +660,8 @@
38 settings->hintstyle);
39 update_property (add_string, "Xft.rgba",
40 settings->rgba);
41+ update_property (add_string, "Xcursor.size",
42+ g_ascii_dtostr (dpibuf, sizeof (dpibuf), (double) settings->cursor_size));
43
44 g_debug("xft_settings_set_xresources: new res '%s'", add_string->str);
45
46@@ -885,7 +887,7 @@
47 guint i;
48 char *schema;
49
50- g_object_get (settings, "schema", &schema, NULL);
51+ g_object_get (settings, "schema-id", &schema, NULL);
52
53 for (i = 0; i < G_N_ELEMENTS (translations); i++) {
54 if (g_str_equal (schema, translations[i].gsettings_schema) &&
55@@ -910,7 +912,8 @@
56 GVariant *value;
57
58 if (g_str_equal (key, TEXT_SCALING_FACTOR_KEY) ||
59- g_str_equal (key, SCALING_FACTOR_KEY)) {
60+ g_str_equal (key, SCALING_FACTOR_KEY) ||
61+ g_str_equal (key, CURSOR_SIZE_KEY)) {
62 xft_callback (NULL, key, manager);
63 return;
64 }
65@@ -1147,26 +1150,11 @@
66 }
67 }
68
69-static GObject *
70-gnome_xsettings_manager_constructor (GType type,
71- guint n_construct_properties,
72- GObjectConstructParam *construct_properties)
73-{
74- GnomeXSettingsManager *xsettings_manager;
75-
76- xsettings_manager = GNOME_XSETTINGS_MANAGER (G_OBJECT_CLASS (gnome_xsettings_manager_parent_class)->constructor (type,
77- n_construct_properties,
78- construct_properties));
79-
80- return G_OBJECT (xsettings_manager);
81-}
82-
83 static void
84 gnome_xsettings_manager_class_init (GnomeXSettingsManagerClass *klass)
85 {
86 GObjectClass *object_class = G_OBJECT_CLASS (klass);
87
88- object_class->constructor = gnome_xsettings_manager_constructor;
89 object_class->finalize = gnome_xsettings_manager_finalize;
90
91 g_type_class_add_private (klass, sizeof (GnomeXSettingsManagerPrivate));

Subscribers

People subscribed via source and target branches