← Back to branch summary

~ubuntu-branches/ubuntu/utopic/gnome-settings-daemon/utopic

« back to all changes in this revision

Viewing changes to .pc/xsettings_signal_handling.patch/plugins/xsettings/gsd-xsettings-gtk.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Rico Tzschichholz, Iain Lane
  • Date: 2012-11-21 17:16:23 UTC
  • mfrom: (1.1.62)
  • Revision ID: package-import@ubuntu.com-20121121171623-k7iufrs14qoiozeq
Tags: 3.6.3-0ubuntu1
https://launchpad.net/bugs/1008840
[ Sebastien Bacher ]
* New upstream version (lp: #1008840)
* debian/patches/git*,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/power-ignore-bad-dbus-requests.patch,
  debian/patches/10_smaller_syndaemon_timeout.patch: 
  - dropped, those fixes are in the new version
* debian/control.in:
  - restore build-depends on libgnomekbd-dev, libxklavier-dev,
    drop the build-depends on libxkbfile-dev
* debian/patches/20_migrate_background_uri.patch:
  - dropped, it was only needed until the LTS
* debian/patches/40_xres_lcddefault.patch:
  - dropped, that was a workaround for libreoffice that shouldn't be
    needed and we should better fix libreoffice
* debian/patches/61_unity_use_application_indicator.patch:
  - drop the keyboard indicator code, that will need to be turned 
    into a proper indicator refactored to handle the new ibus config
* debian/patches/90_set_gmenus_xsettings.patch:
  - refreshed for the new version
* debian/patches/revert_new_ibus_use.patch:
  - revert keyboard code to our 3.4 version
* debian/patches/sync_keyboard_layout_to_accountsservice.patch:
  - dropped, the changes are included in the previous patch

[ Robert Ancell ]
* New upstream release
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Drop build-depends on libgnomekbd-dev, libxklavier-dev
  - Add build-depends on libxkbfile-dev

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on gtk-doc-tools

[ Iain Lane ]
* New upstream release
* Refresh patches and remove those applied upstream.
* Remove gstreamer BDs which are now obsolete. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/xsettings_signal_handling.patch/plugins/xsettings/gsd-xsettings-gtk.c
1
 
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2
 
 *
3
 
 * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
4
 
 *
5
 
 * This program is free software; you can redistribute it and/or modify
6
 
 * it under the terms of the GNU General Public License as published by
7
 
 * the Free Software Foundation; either version 2, or (at your option)
8
 
 * any later version.
9
 
 *
10
 
 * This program is distributed in the hope that it will be useful,
11
 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 
 * GNU General Public License for more details.
14
 
 *
15
 
 * You should have received a copy of the GNU General Public License
16
 
 * along with this program; if not, write to the Free Software
17
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
 
 *
19
 
 */
20
 
 
21
 
#include "config.h"
22
 
 
23
 
#include <glib/gi18n-lib.h>
24
 
#include <gio/gio.h>
25
 
 
26
 
#include "gsd-xsettings-gtk.h"
27
 
 
28
 
#define XSETTINGS_PLUGIN_SCHEMA "org.gnome.settings-daemon.plugins.xsettings"
29
 
 
30
 
#define GTK_MODULES_DISABLED_KEY "disabled-gtk-modules"
31
 
#define GTK_MODULES_ENABLED_KEY  "enabled-gtk-modules"
32
 
 
33
 
enum {
34
 
        PROP_0,
35
 
        PROP_GTK_MODULES
36
 
};
37
 
 
38
 
struct GsdXSettingsGtkPrivate {
39
 
        char              *modules;
40
 
        GHashTable        *dir_modules;
41
 
 
42
 
        GSettings         *settings;
43
 
 
44
 
        guint64            dir_mtime;
45
 
        GFileMonitor      *monitor;
46
 
        GList             *cond_settings;
47
 
};
48
 
 
49
 
#define GSD_XSETTINGS_GTK_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_XSETTINGS_GTK, GsdXSettingsGtkPrivate))
50
 
 
51
 
G_DEFINE_TYPE(GsdXSettingsGtk, gsd_xsettings_gtk, G_TYPE_OBJECT)
52
 
 
53
 
static void update_gtk_modules (GsdXSettingsGtk *gtk);
54
 
 
55
 
static void
56
 
empty_cond_settings_list (GsdXSettingsGtk *gtk)
57
 
{
58
 
        if (gtk->priv->cond_settings == NULL)
59
 
                return;
60
 
 
61
 
        /* Empty the list of settings */
62
 
        g_list_foreach (gtk->priv->cond_settings, (GFunc) g_object_unref, NULL);
63
 
        g_list_free (gtk->priv->cond_settings);
64
 
        gtk->priv->cond_settings = NULL;
65
 
}
66
 
 
67
 
static void
68
 
cond_setting_changed (GSettings       *settings,
69
 
                      const char      *key,
70
 
                      GsdXSettingsGtk *gtk)
71
 
{
72
 
        gboolean enabled;
73
 
        const char *module_name;
74
 
 
75
 
        module_name = g_object_get_data (G_OBJECT (settings), "module-name");
76
 
 
77
 
        enabled = g_settings_get_boolean (settings, key);
78
 
        if (enabled != FALSE) {
79
 
                if (gtk->priv->dir_modules == NULL)
80
 
                        gtk->priv->dir_modules = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
81
 
                g_hash_table_insert (gtk->priv->dir_modules, g_strdup (module_name), NULL);
82
 
        } else if (gtk->priv->dir_modules != NULL) {
83
 
                g_hash_table_remove (gtk->priv->dir_modules, module_name);
84
 
        }
85
 
 
86
 
        update_gtk_modules (gtk);
87
 
}
88
 
 
89
 
static char *
90
 
process_desktop_file (const char      *path,
91
 
                      GsdXSettingsGtk *gtk)
92
 
{
93
 
        GKeyFile *keyfile;
94
 
        char *retval;
95
 
        char *module_name;
96
 
 
97
 
        retval = NULL;
98
 
 
99
 
        if (g_str_has_suffix (path, ".desktop") == FALSE &&
100
 
            g_str_has_suffix (path, ".gtk-module") == FALSE)
101
 
                return retval;
102
 
 
103
 
        keyfile = g_key_file_new ();
104
 
        if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL) == FALSE)
105
 
                goto bail;
106
 
 
107
 
        if (g_key_file_has_group (keyfile, "GTK Module") == FALSE)
108
 
                goto bail;
109
 
 
110
 
        module_name = g_key_file_get_string (keyfile, "GTK Module", "X-GTK-Module-Name", NULL);
111
 
        if (module_name == NULL)
112
 
                goto bail;
113
 
 
114
 
        if (g_key_file_has_key (keyfile, "GTK Module", "X-GTK-Module-Enabled-Schema", NULL) != FALSE) {
115
 
                char *schema;
116
 
                char *key;
117
 
                gboolean enabled;
118
 
                GSettings *settings;
119
 
                char *signal;
120
 
 
121
 
                schema = g_key_file_get_string (keyfile, "GTK Module", "X-GTK-Module-Enabled-Schema", NULL);
122
 
                key = g_key_file_get_string (keyfile, "GTK Module", "X-GTK-Module-Enabled-Key", NULL);
123
 
 
124
 
                settings = g_settings_new (schema);
125
 
                enabled = g_settings_get_boolean (settings, key);
126
 
 
127
 
                gtk->priv->cond_settings = g_list_prepend (gtk->priv->cond_settings, settings);
128
 
 
129
 
                g_object_set_data_full (G_OBJECT (settings), "module-name", g_strdup (module_name), (GDestroyNotify) g_free);
130
 
 
131
 
                signal = g_strdup_printf ("changed::%s", key);
132
 
                g_signal_connect (G_OBJECT (settings), signal,
133
 
                                  G_CALLBACK (cond_setting_changed), gtk);
134
 
                g_free (signal);
135
 
                g_free (schema);
136
 
                g_free (key);
137
 
 
138
 
                if (enabled != FALSE)
139
 
                        retval = g_strdup (module_name);
140
 
        } else {
141
 
                retval = g_strdup (module_name);
142
 
        }
143
 
 
144
 
        g_free (module_name);
145
 
 
146
 
bail:
147
 
        g_key_file_free (keyfile);
148
 
        return retval;
149
 
}
150
 
 
151
 
static void
152
 
get_gtk_modules_from_dir (GsdXSettingsGtk *gtk)
153
 
{
154
 
        GFile *file;
155
 
        GFileInfo *info;
156
 
        GHashTable *ht;
157
 
 
158
 
        file = g_file_new_for_path (GTK_MODULES_DIRECTORY);
159
 
        info = g_file_query_info (file,
160
 
                                  G_FILE_ATTRIBUTE_TIME_MODIFIED,
161
 
                                  G_FILE_QUERY_INFO_NONE,
162
 
                                  NULL,
163
 
                                  NULL);
164
 
        if (info != NULL) {
165
 
                guint64 dir_mtime;
166
 
 
167
 
                dir_mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
168
 
                if (gtk->priv->dir_mtime == 0 ||
169
 
                    dir_mtime > gtk->priv->dir_mtime) {
170
 
                        GDir *dir;
171
 
                        const char *name;
172
 
 
173
 
                        empty_cond_settings_list (gtk);
174
 
 
175
 
                        gtk->priv->dir_mtime = dir_mtime;
176
 
 
177
 
                        if (gtk->priv->dir_modules != NULL) {
178
 
                                g_hash_table_destroy (gtk->priv->dir_modules);
179
 
                                gtk->priv->dir_modules = NULL;
180
 
                        }
181
 
 
182
 
                        dir = g_dir_open (GTK_MODULES_DIRECTORY, 0, NULL);
183
 
                        if (dir == NULL)
184
 
                                goto bail;
185
 
 
186
 
                        ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
187
 
 
188
 
                        while ((name = g_dir_read_name (dir)) != NULL) {
189
 
                                char *path;
190
 
                                char *module;
191
 
 
192
 
                                path = g_build_filename (GTK_MODULES_DIRECTORY, name, NULL);
193
 
                                module = process_desktop_file (path, gtk);
194
 
                                if (module != NULL)
195
 
                                        g_hash_table_insert (ht, module, NULL);
196
 
                                g_free (path);
197
 
                        }
198
 
                        g_dir_close (dir);
199
 
 
200
 
                        gtk->priv->dir_modules = ht;
201
 
                }
202
 
                g_object_unref (info);
203
 
        } else {
204
 
                empty_cond_settings_list (gtk);
205
 
        }
206
 
 
207
 
bail:
208
 
        g_object_unref (file);
209
 
}
210
 
 
211
 
static void
212
 
stringify_gtk_modules (gpointer key,
213
 
                       gpointer value,
214
 
                       GString *str)
215
 
{
216
 
        if (str->len != 0)
217
 
                g_string_append_c (str, ':');
218
 
        g_string_append (str, key);
219
 
}
220
 
 
221
 
static void
222
 
update_gtk_modules (GsdXSettingsGtk *gtk)
223
 
{
224
 
        char **enabled, **disabled;
225
 
        GHashTable *ht;
226
 
        guint i;
227
 
        GString *str;
228
 
        char *modules;
229
 
 
230
 
        enabled = g_settings_get_strv (gtk->priv->settings, GTK_MODULES_ENABLED_KEY);
231
 
        disabled = g_settings_get_strv (gtk->priv->settings, GTK_MODULES_DISABLED_KEY);
232
 
 
233
 
        ht = g_hash_table_new (g_str_hash, g_str_equal);
234
 
 
235
 
        if (gtk->priv->dir_modules != NULL) {
236
 
                GList *list, *l;
237
 
 
238
 
                list = g_hash_table_get_keys (gtk->priv->dir_modules);
239
 
                for (l = list; l != NULL; l = l->next) {
240
 
                        g_hash_table_insert (ht, l->data, NULL);
241
 
                }
242
 
                g_list_free (list);
243
 
        }
244
 
 
245
 
        for (i = 0; enabled[i] != NULL; i++)
246
 
                g_hash_table_insert (ht, enabled[i], NULL);
247
 
 
248
 
        for (i = 0; disabled[i] != NULL; i++)
249
 
                g_hash_table_remove (ht, disabled[i]);
250
 
 
251
 
        str = g_string_new (NULL);
252
 
        g_hash_table_foreach (ht, (GHFunc) stringify_gtk_modules, str);
253
 
        g_hash_table_destroy (ht);
254
 
 
255
 
        modules = g_string_free (str, FALSE);
256
 
 
257
 
        if (modules == NULL ||
258
 
            gtk->priv->modules == NULL ||
259
 
            g_str_equal (modules, gtk->priv->modules) == FALSE) {
260
 
                g_free (gtk->priv->modules);
261
 
                gtk->priv->modules = modules;
262
 
                g_object_notify (G_OBJECT (gtk), "gtk-modules");
263
 
        } else {
264
 
                g_free (modules);
265
 
        }
266
 
 
267
 
        g_strfreev (enabled);
268
 
        g_strfreev (disabled);
269
 
}
270
 
 
271
 
static void
272
 
gtk_modules_dir_changed_cb (GFileMonitor     *monitor,
273
 
                            GFile            *file,
274
 
                            GFile            *other_file,
275
 
                            GFileMonitorEvent event_type,
276
 
                            GsdXSettingsGtk  *gtk)
277
 
{
278
 
        get_gtk_modules_from_dir (gtk);
279
 
        update_gtk_modules (gtk);
280
 
}
281
 
 
282
 
static void
283
 
gsd_xsettings_gtk_init (GsdXSettingsGtk *gtk)
284
 
{
285
 
        GFile *file;
286
 
 
287
 
        gtk->priv = GSD_XSETTINGS_GTK_GET_PRIVATE (gtk);
288
 
 
289
 
        g_debug ("GsdXSettingsGtk initializing");
290
 
 
291
 
        gtk->priv->settings = g_settings_new (XSETTINGS_PLUGIN_SCHEMA);
292
 
 
293
 
        get_gtk_modules_from_dir (gtk);
294
 
 
295
 
        file = g_file_new_for_path (GTK_MODULES_DIRECTORY);
296
 
        gtk->priv->monitor = g_file_monitor (file,
297
 
                                             G_FILE_MONITOR_NONE,
298
 
                                             NULL,
299
 
                                             NULL);
300
 
        g_signal_connect (G_OBJECT (gtk->priv->monitor), "changed",
301
 
                          G_CALLBACK (gtk_modules_dir_changed_cb), gtk);
302
 
        g_object_unref (file);
303
 
 
304
 
        update_gtk_modules (gtk);
305
 
}
306
 
 
307
 
static void
308
 
gsd_xsettings_gtk_finalize (GObject *object)
309
 
{
310
 
        GsdXSettingsGtk *gtk;
311
 
 
312
 
        g_return_if_fail (object != NULL);
313
 
        g_return_if_fail (GSD_IS_XSETTINGS_GTK (object));
314
 
 
315
 
        g_debug ("GsdXSettingsGtk finalizing");
316
 
 
317
 
        gtk = GSD_XSETTINGS_GTK (object);
318
 
 
319
 
        g_return_if_fail (gtk->priv != NULL);
320
 
 
321
 
        g_free (gtk->priv->modules);
322
 
        gtk->priv->modules = NULL;
323
 
 
324
 
        if (gtk->priv->dir_modules != NULL) {
325
 
                g_hash_table_destroy (gtk->priv->dir_modules);
326
 
                gtk->priv->dir_modules = NULL;
327
 
        }
328
 
 
329
 
        g_object_unref (gtk->priv->settings);
330
 
 
331
 
        if (gtk->priv->monitor != NULL)
332
 
                g_object_unref (gtk->priv->monitor);
333
 
 
334
 
        empty_cond_settings_list (gtk);
335
 
 
336
 
        G_OBJECT_CLASS (gsd_xsettings_gtk_parent_class)->finalize (object);
337
 
}
338
 
 
339
 
static void
340
 
gsd_xsettings_gtk_get_property (GObject        *object,
341
 
                                guint           prop_id,
342
 
                                GValue         *value,
343
 
                                GParamSpec     *pspec)
344
 
{
345
 
        GsdXSettingsGtk *self;
346
 
 
347
 
        self = GSD_XSETTINGS_GTK (object);
348
 
 
349
 
        switch (prop_id) {
350
 
        case PROP_GTK_MODULES:
351
 
                g_value_set_string (value, self->priv->modules);
352
 
                break;
353
 
        default:
354
 
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
355
 
                break;
356
 
        }
357
 
}
358
 
 
359
 
static void
360
 
gsd_xsettings_gtk_class_init (GsdXSettingsGtkClass *klass)
361
 
{
362
 
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
363
 
 
364
 
        object_class->get_property = gsd_xsettings_gtk_get_property;
365
 
        object_class->finalize = gsd_xsettings_gtk_finalize;
366
 
 
367
 
        g_object_class_install_property (object_class, PROP_GTK_MODULES,
368
 
                                         g_param_spec_string ("gtk-modules", NULL, NULL,
369
 
                                                              NULL, G_PARAM_READABLE));
370
 
 
371
 
        g_type_class_add_private (klass, sizeof (GsdXSettingsGtkPrivate));
372
 
}
373
 
 
374
 
GsdXSettingsGtk *
375
 
gsd_xsettings_gtk_new (void)
376
 
{
377
 
        return GSD_XSETTINGS_GTK (g_object_new (GSD_TYPE_XSETTINGS_GTK, NULL));
378
 
}
379
 
 
380
 
const char *
381
 
gsd_xsettings_gtk_get_modules (GsdXSettingsGtk *gtk)
382
 
{
383
 
        return gtk->priv->modules;
384
 
}