Unity Settings Daemon

Merge lp:~darkxst/unity-settings-daemon/lp1372346 into lp:unity-settings-daemon

  1. lp1372346
  2. Merge into trunk
Proposed by Tim Lunn
Status: Merged
Approved by: Martin Pitt
Approved revision: 4052
Merged at revision: 4052
Proposed branch: lp:~darkxst/unity-settings-daemon/lp1372346
Merge into: lp:unity-settings-daemon
Diff against target: 286 lines (+157/-10)
8 files modified
configure.ac (+3/-1)
debian/changelog (+18/-0)
debian/control (+5/-5)
plugins/keyboard/Makefile.am (+5/-0)
plugins/keyboard/gsd-keyboard-manager.c (+3/-4)
plugins/keyboard/gsd-xkb-utils.c (+90/-0)
plugins/keyboard/gsd-xkb-utils.h (+32/-0)
plugins/keyboard/test-keyboard-ibus-utils.c (+1/-0)
To merge this branch: bzr merge lp:~darkxst/unity-settings-daemon/lp1372346
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+236312@code.launchpad.net

Commit message

* Rebuild for gnome-desktop 3.12 (LP: #1372346)
* debian/control: Drop depends gnome-settings-daemon-schemas (<< 3.10),
   gnome-settings-daemon 3.12 reverts all removed keys
* Fix merge of xkb get/free_info_vars

Description of the change

  * Rebuild for gnome-desktop 3.12 (LP: #1372346)
  * debian/control: Drop depends gnome-settings-daemon-schemas (<< 3.10),
    gnome-settings-daemon 3.12 reverts all removed keys
  * Fix renaming of xkb get/free_info_vars

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

This branch should probably depend on https://code.launchpad.net/~robert-ancell/unity-settings-daemon/fix-libusd-depends/+merge/235557

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Or just not have those changes - the CI system will merge the two branches itself.

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Change appears to be a straight copy out of gnome-desktop3, which is exactly what we want. Thanks Tim!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2014-08-29 10:24:00 +0000
+++ configure.ac 2014-09-29 12:19:40 +0000
@@ -204,8 +204,10 @@
204fi204fi
205AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")205AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
206206
207PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)207PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile xkeyboard-config $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
208208
209XKB_BASE=$($PKG_CONFIG --variable xkb_base xkeyboard-config)
210AC_SUBST(XKB_BASE)
209dnl ---------------------------------------------------------------------------211dnl ---------------------------------------------------------------------------
210dnl - Housekeeping plugin stuff212dnl - Housekeeping plugin stuff
211dnl ---------------------------------------------------------------------------213dnl ---------------------------------------------------------------------------
212214
=== modified file 'debian/changelog'
--- debian/changelog 2014-09-22 11:29:12 +0000
+++ debian/changelog 2014-09-29 12:19:40 +0000
@@ -1,3 +1,21 @@
1unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu3) utopic; urgency=medium
2
3 * Rebuild for gnome-desktop 3.12 (LP: #1372346)
4 * debian/control: Drop depends gnome-settings-daemon-schemas (<< 3.10),
5 gnome-settings-daemon 3.12 reverts all removed keys
6 * Fix merge of git patch for xkb get/free info_vars
7
8 -- Tim Lunn <tim@feathertop.org> Mon, 29 Sep 2014 20:05:27 +1000
9
10unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu2) utopic; urgency=medium
11
12 * debian/control:
13 - Move -dev dependencies from libunity-settings-daemon1 to
14 libunity-settings-daemon-dev and add it to the correct section
15 (LP: #1372728)
16
17 -- Robert Ancell <robert.ancell@canonical.com> Wed, 24 Sep 2014 15:38:13 +1200
18
1unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu1) utopic; urgency=low19unity-settings-daemon (14.04.0+14.10.20140922-0ubuntu1) utopic; urgency=low
220
3 [ Robert Ancell ]21 [ Robert Ancell ]
422
=== modified file 'debian/control'
--- debian/control 2014-09-22 11:23:09 +0000
+++ debian/control 2014-09-29 12:19:40 +0000
@@ -54,7 +54,6 @@
54 gsettings-desktop-schemas (>= 3.7.2.1),54 gsettings-desktop-schemas (>= 3.7.2.1),
55 nautilus-data (>= 2.91.3-1),55 nautilus-data (>= 2.91.3-1),
56 gnome-settings-daemon-schemas (>= 3.8), 56 gnome-settings-daemon-schemas (>= 3.8),
57 gnome-settings-daemon-schemas (<< 3.10),
58 gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),57 gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
59Recommends: ibus (>= 1.5.0),58Recommends: ibus (>= 1.5.0),
60 pulseaudio,59 pulseaudio,
@@ -102,16 +101,17 @@
102Package: libunity-settings-daemon1101Package: libunity-settings-daemon1
103Architecture: any102Architecture: any
104Depends: ${shlibs:Depends},103Depends: ${shlibs:Depends},
105 ${misc:Depends},104 ${misc:Depends}
106 libglib2.0-dev,
107 libgtk-3-dev
108Description: Helper library for accessing settings105Description: Helper library for accessing settings
109 This package contains a helper library for unity-control-center106 This package contains a helper library for unity-control-center
110107
111Package: libunity-settings-daemon-dev108Package: libunity-settings-daemon-dev
109Section: libdevel
112Architecture: any110Architecture: any
113Depends: ${shlibs:Depends},111Depends: ${shlibs:Depends},
114 ${misc:Depends},112 ${misc:Depends},
115 libunity-settings-daemon1 (= ${binary:Version})113 libunity-settings-daemon1 (= ${binary:Version}),
114 libglib2.0-dev,
115 libgtk-3-dev
116Description: Helper library for accessing settings (development files)116Description: Helper library for accessing settings (development files)
117 This package contains a headers for using libunity-settings-daemon117 This package contains a headers for using libunity-settings-daemon
118118
=== modified file 'plugins/keyboard/Makefile.am'
--- plugins/keyboard/Makefile.am 2013-12-04 23:55:26 +0000
+++ plugins/keyboard/Makefile.am 2014-09-29 12:19:40 +0000
@@ -19,6 +19,8 @@
19 gsd-keyboard-plugin.c \19 gsd-keyboard-plugin.c \
20 gsd-keyboard-manager.h \20 gsd-keyboard-manager.h \
21 gsd-keyboard-manager.c \21 gsd-keyboard-manager.c \
22 gsd-xkb-utils.h \
23 gsd-xkb-utils.c \
22 $(NULL)24 $(NULL)
2325
24libkeyboard_la_CPPFLAGS = \26libkeyboard_la_CPPFLAGS = \
@@ -28,6 +30,7 @@
28 -DDATADIR=\""$(pkgdatadir)"\" \30 -DDATADIR=\""$(pkgdatadir)"\" \
29 -DLIBEXECDIR=\""$(libexecdir)"\" \31 -DLIBEXECDIR=\""$(libexecdir)"\" \
30 -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \32 -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
33 -DXKB_BASE=\""$(XKB_BASE)"\" \
31 $(AM_CPPFLAGS)34 $(AM_CPPFLAGS)
3235
33libkeyboard_la_CFLAGS = \36libkeyboard_la_CFLAGS = \
@@ -52,6 +55,8 @@
52 test-keyboard.c \55 test-keyboard.c \
53 gsd-keyboard-manager.h \56 gsd-keyboard-manager.h \
54 gsd-keyboard-manager.c \57 gsd-keyboard-manager.c \
58 gsd-xkb-utils.h \
59 gsd-xkb-utils.c \
55 $(NULL)60 $(NULL)
5661
57usd_test_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS)62usd_test_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS)
5863
=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c 2014-04-12 09:30:04 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c 2014-09-29 12:19:40 +0000
@@ -38,9 +38,7 @@
38#include <gdk/gdkx.h>38#include <gdk/gdkx.h>
39#include <gtk/gtk.h>39#include <gtk/gtk.h>
4040
41#include <X11/XKBlib.h>
42#include <X11/keysym.h>41#include <X11/keysym.h>
43#include <X11/extensions/XKBrules.h>
4442
45#define GNOME_DESKTOP_USE_UNSTABLE_API43#define GNOME_DESKTOP_USE_UNSTABLE_API
46#include <libgnome-desktop/gnome-languages.h>44#include <libgnome-desktop/gnome-languages.h>
@@ -57,6 +55,7 @@
57#include "gsd-keyboard-manager.h"55#include "gsd-keyboard-manager.h"
58#include "gsd-input-helper.h"56#include "gsd-input-helper.h"
59#include "gsd-enums.h"57#include "gsd-enums.h"
58#include "gsd-xkb-utils.h"
6059
61#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))60#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
6261
@@ -987,7 +986,7 @@
987 XkbRF_VarDefsRec *xkb_var_defs;986 XkbRF_VarDefsRec *xkb_var_defs;
988 gchar *rules_file_path;987 gchar *rules_file_path;
989988
990 gnome_xkb_info_get_var_defs (&rules_file_path, &xkb_var_defs);989 gsd_xkb_get_var_defs (&rules_file_path, &xkb_var_defs);
991990
992 free (xkb_var_defs->options);991 free (xkb_var_defs->options);
993 xkb_var_defs->options = options;992 xkb_var_defs->options = options;
@@ -1013,7 +1012,7 @@
1013 if (gdk_error_trap_pop ())1012 if (gdk_error_trap_pop ())
1014 g_warning ("Error loading XKB rules");1013 g_warning ("Error loading XKB rules");
10151014
1016 gnome_xkb_info_free_var_defs (xkb_var_defs);1015 gsd_xkb_free_var_defs (xkb_var_defs);
1017 g_free (rules_file_path);1016 g_free (rules_file_path);
10181017
1019 XkbLockModifiers (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbUseCoreKbd, LockMask, 0);1018 XkbLockModifiers (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbUseCoreKbd, LockMask, 0);
10201019
=== added file 'plugins/keyboard/gsd-xkb-utils.c'
--- plugins/keyboard/gsd-xkb-utils.c 1970-01-01 00:00:00 +0000
+++ plugins/keyboard/gsd-xkb-utils.c 2014-09-29 12:19:40 +0000
@@ -0,0 +1,90 @@
1/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2 *
3 * Copyright (C) 2012 Red Hat, Inc.
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 of the License, or
8 * (at your option) 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, see <http://www.gnu.org/licenses/>.
17 *
18 */
19
20#include "config.h"
21
22#include <stdio.h>
23#include <stdlib.h>
24#include <string.h>
25
26#include <glib.h>
27#include <gdk/gdk.h>
28#include <gdk/gdkx.h>
29
30#include "gsd-xkb-utils.h"
31
32#ifndef XKB_RULES_FILE
33#define XKB_RULES_FILE "evdev"
34#endif
35#ifndef XKB_LAYOUT
36#define XKB_LAYOUT "us"
37#endif
38#ifndef XKB_MODEL
39#define XKB_MODEL "pc105+inet"
40#endif
41
42void
43gsd_xkb_get_var_defs (char **rules,
44 XkbRF_VarDefsRec **var_defs)
45{
46 Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
47 char *tmp;
48
49 g_return_if_fail (rules != NULL);
50 g_return_if_fail (var_defs != NULL);
51
52 *rules = NULL;
53 *var_defs = g_new0 (XkbRF_VarDefsRec, 1);
54
55 gdk_error_trap_push ();
56
57 /* Get it from the X property or fallback on defaults */
58 if (!XkbRF_GetNamesProp (display, rules, *var_defs) || !*rules) {
59 *rules = strdup (XKB_RULES_FILE);
60 (*var_defs)->model = strdup (XKB_MODEL);
61 (*var_defs)->layout = strdup (XKB_LAYOUT);
62 (*var_defs)->variant = NULL;
63 (*var_defs)->options = NULL;
64 }
65
66 gdk_error_trap_pop_ignored ();
67
68 tmp = *rules;
69
70 if (*rules[0] == '/')
71 *rules = g_strdup (*rules);
72 else
73 *rules = g_build_filename (XKB_BASE, "rules", *rules, NULL);
74
75 free (tmp);
76}
77
78void
79gsd_xkb_free_var_defs (XkbRF_VarDefsRec *var_defs)
80{
81 g_return_if_fail (var_defs != NULL);
82
83 free (var_defs->model);
84 free (var_defs->layout);
85 free (var_defs->variant);
86 free (var_defs->options);
87
88 g_free (var_defs);
89}
90
091
=== added file 'plugins/keyboard/gsd-xkb-utils.h'
--- plugins/keyboard/gsd-xkb-utils.h 1970-01-01 00:00:00 +0000
+++ plugins/keyboard/gsd-xkb-utils.h 2014-09-29 12:19:40 +0000
@@ -0,0 +1,32 @@
1/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2 *
3 * Copyright (C) 2012 Red Hat, Inc.
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 of the License, or
8 * (at your option) 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, see <http://www.gnu.org/licenses/>.
17 *
18 */
19
20#ifndef __GSD_XKB_UTILS_H
21#define __GSD_XKB_UTILS_H
22
23#include <X11/XKBlib.h>
24#include <X11/extensions/XKBrules.h>
25
26void
27gsd_xkb_get_var_defs (char **rules,
28 XkbRF_VarDefsRec **var_defs);
29void
30gsd_xkb_free_var_defs (XkbRF_VarDefsRec *var_defs);
31
32#endif /* __GSD_XKB_UTILS_H */
033
=== modified file 'plugins/keyboard/test-keyboard-ibus-utils.c'
--- plugins/keyboard/test-keyboard-ibus-utils.c 2013-03-19 15:18:34 +0000
+++ plugins/keyboard/test-keyboard-ibus-utils.c 2014-09-29 12:19:40 +0000
@@ -1,3 +1,4 @@
1#include "gsd-xkb-utils.c"
1#include "gsd-keyboard-manager.c"2#include "gsd-keyboard-manager.c"
23
3static void4static void

Subscribers

People subscribed via source and target branches