diff options
Diffstat (limited to 'meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch')
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch new file mode 100644 index 000000000..eff052b68 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch | |||
@@ -0,0 +1,137 @@ | |||
1 | From a3b0218137c8796fbb7bd6d852dc8ab5895a65cb Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Sat, 3 Nov 2012 18:32:01 +0100 | ||
4 | Subject: [PATCH 3/5] XfcePointersHelper gets a pointer to XfceXSettingsHelper | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | |||
10 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
11 | Upstream-Status: Submitted [1] | ||
12 | [1] https://bugzilla.xfce.org/show_bug.cgi?id=9474 | ||
13 | --- | ||
14 | xfsettingsd/main.c | 2 +- | ||
15 | xfsettingsd/pointers.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ | ||
16 | 2 files changed, 56 insertions(+), 1 deletions(-) | ||
17 | |||
18 | diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c | ||
19 | index 55c4183..99982f7 100644 | ||
20 | --- a/xfsettingsd/main.c | ||
21 | +++ b/xfsettingsd/main.c | ||
22 | @@ -273,7 +273,7 @@ main (gint argc, gchar **argv) | ||
23 | #ifdef HAVE_XRANDR | ||
24 | displays_helper = g_object_new (XFCE_TYPE_DISPLAYS_HELPER, NULL); | ||
25 | #endif | ||
26 | - pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL); | ||
27 | + pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, "xsettings-helper", xsettings_helper, NULL); | ||
28 | keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL); | ||
29 | accessibility_helper = g_object_new (XFCE_TYPE_ACCESSIBILITY_HELPER, NULL); | ||
30 | shortcuts_helper = g_object_new (XFCE_TYPE_KEYBOARD_SHORTCUTS_HELPER, NULL); | ||
31 | diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c | ||
32 | index e7192e7..62ebc60 100644 | ||
33 | --- a/xfsettingsd/pointers.c | ||
34 | +++ b/xfsettingsd/pointers.c | ||
35 | @@ -47,8 +47,16 @@ | ||
36 | |||
37 | #define XFCONF_TYPE_G_VALUE_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_VALUE)) | ||
38 | |||
39 | +/* Property identifiers */ | ||
40 | +enum | ||
41 | +{ | ||
42 | + PROP_0, | ||
43 | + PROP_XSETTINGS_HELPER, | ||
44 | +}; | ||
45 | + | ||
46 | |||
47 | |||
48 | +static void xfce_pointers_helper_constructed (GObject *object); | ||
49 | static void xfce_pointers_helper_finalize (GObject *object); | ||
50 | static void xfce_pointers_helper_syndaemon_stop (XfcePointersHelper *helper); | ||
51 | static void xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper); | ||
52 | @@ -63,6 +71,10 @@ static GdkFilterReturn xfce_pointers_helper_event_filter (GdkXEvent | ||
53 | GdkEvent *gdk_event, | ||
54 | gpointer user_data); | ||
55 | #endif | ||
56 | +static void xfce_pointers_helper_set_property (GObject *object, | ||
57 | + guint prop_id, | ||
58 | + const GValue *value, | ||
59 | + GParamSpec *pspec); | ||
60 | |||
61 | |||
62 | |||
63 | @@ -75,6 +87,8 @@ struct _XfcePointersHelper | ||
64 | { | ||
65 | GObject __parent__; | ||
66 | |||
67 | + GObject *xsettings_helper; | ||
68 | + | ||
69 | /* xfconf channel */ | ||
70 | XfconfChannel *channel; | ||
71 | |||
72 | @@ -108,7 +122,18 @@ xfce_pointers_helper_class_init (XfcePointersHelperClass *klass) | ||
73 | { | ||
74 | GObjectClass *gobject_class = G_OBJECT_CLASS (klass); | ||
75 | |||
76 | + gobject_class->constructed = xfce_pointers_helper_constructed; | ||
77 | gobject_class->finalize = xfce_pointers_helper_finalize; | ||
78 | + gobject_class->set_property = xfce_pointers_helper_set_property; | ||
79 | + | ||
80 | + g_object_class_install_property (gobject_class, | ||
81 | + PROP_XSETTINGS_HELPER, | ||
82 | + g_param_spec_object ("xsettings-helper", | ||
83 | + "xsettings-helper", | ||
84 | + "xsettings-helper", | ||
85 | + G_TYPE_OBJECT, | ||
86 | + G_PARAM_CONSTRUCT_ONLY | | ||
87 | + G_PARAM_WRITABLE)); | ||
88 | } | ||
89 | |||
90 | |||
91 | @@ -116,6 +141,15 @@ xfce_pointers_helper_class_init (XfcePointersHelperClass *klass) | ||
92 | static void | ||
93 | xfce_pointers_helper_init (XfcePointersHelper *helper) | ||
94 | { | ||
95 | + /* All initialisation is done at xfce_pointers_helper_constructed */ | ||
96 | +} | ||
97 | + | ||
98 | + | ||
99 | + | ||
100 | +static void | ||
101 | +xfce_pointers_helper_constructed (GObject *object) | ||
102 | +{ | ||
103 | + XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object); | ||
104 | XExtensionVersion *version = NULL; | ||
105 | Display *xdisplay; | ||
106 | #ifdef DEVICE_HOTPLUGGING | ||
107 | @@ -181,6 +215,27 @@ xfce_pointers_helper_init (XfcePointersHelper *helper) | ||
108 | |||
109 | |||
110 | static void | ||
111 | +xfce_pointers_helper_set_property (GObject *object, | ||
112 | + guint prop_id, | ||
113 | + const GValue *value, | ||
114 | + GParamSpec *pspec) | ||
115 | +{ | ||
116 | + XfcePointersHelper *helper = XFCE_POINTERS_HELPER (object); | ||
117 | + | ||
118 | + switch (prop_id) | ||
119 | + { | ||
120 | + case PROP_XSETTINGS_HELPER: | ||
121 | + helper->xsettings_helper = g_value_get_object (value); | ||
122 | + break; | ||
123 | + default: | ||
124 | + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); | ||
125 | + break; | ||
126 | + } | ||
127 | +} | ||
128 | + | ||
129 | + | ||
130 | + | ||
131 | +static void | ||
132 | xfce_pointers_helper_finalize (GObject *object) | ||
133 | { | ||
134 | xfce_pointers_helper_syndaemon_stop (XFCE_POINTERS_HELPER (object)); | ||
135 | -- | ||
136 | 1.7.6.5 | ||
137 | |||