Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into
lp:unity-settings-daemon.
Commit message:
* Port media keys to use com.canonical.unity.settings-daemon
u-s-d will still use org.gnome.settings-daemon in dbus. LP: #1842324
* Use new gsettings key location for mouse & keyboard.
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/6dff93a0dfa80db3f481eed5d6ed689bf469aa1b
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/710a4c4e7828828cb35ea14333882354ae73264f
Requested reviews:
Sebastien Bacher (seb128)
Related bugs:
Bug #1842324 in unity-settings-daemon (Ubuntu): "Port schemas from
gnome-settings-daemon-common to com.canonical.unity.settings-daemon"
https://bugs.launchpad.net/ubuntu/+source/unity-settings-daemon/+bug/1842324
For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/use-usd-schemas/+merge/372154
--
Your team Unity Settings Daemon Development Team is subscribed to branch
lp:unity-settings-daemon.
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2014-08-29 10:24:00 +0000
+++ data/Makefile.am 2019-09-04 12:49:16 +0000
@@ -3,6 +3,14 @@
apidir = $(includedir)/unity-settings-daemon-$(GSD_API_VERSION)/unity-settings-daemon
api_DATA = gsd-enums.h
+gschema_in_files = com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
+
+gsettingsdir = $(datadir)/glib-2.0/schemas
+
+%.gschema.xml.in: %.gschema.xml.in.in
+ $(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@
+
@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
@@ -22,6 +30,7 @@
EXTRA_DIST = \
$(convert_DATA) \
+ $(gschema_in_files) \
$(desktop_in_files) \
$(gsettings_ENUM_FILES) \
unity-settings-daemon.pc.in \
@@ -36,4 +45,6 @@
MAINTAINERCLEANFILES = \
*~ \
- Makefile.in
+ Makefile.in \
+ $(gsettings_SCHEMAS:.xml=.valid)
+
=== added file 'data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in'
--- data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in 1970-01-01 00:00:00 +0000
+++ data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in 2019-09-04 12:49:16 +0000
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.media-keys" path="/com/canonical/unity/settings-daemon/plugins/media-keys/">
+ <key name="priority" type="i">
+ <default>0</default>
+ <summary>Priority to use for this plugin</summary>
+ <description>Priority to use for this plugin in unity-settings-daemon startup queue</description>
+ </key>
+ <key name="active" type="b">
+ <default>true</default>
+ <summary>Activation of this plugin</summary>
+ <description>Whether this plugin would be activated by unity-settings-daemon or not</description>
+ </key>
+ <key name="custom-keybindings" type="as">
+ <default>[]</default>
+ <summary>Custom keybindings</summary>
+ <description>List of custom keybindings</description>
+ </key>
+ <key name="calculator" type="s">
+ <default>'XF86Calculator'</default>
+ <summary>Launch calculator</summary>
+ <description>Binding to launch the calculator.</description>
+ </key>
+ <key name="control-center" type="s">
+ <default>'XF86Tools'</default>
+ <summary>Launch settings</summary>
+ <description>Binding to launch GNOME settings.</description>
+ </key>
+ <key name="email" type="s">
+ <default>'XF86Mail'</default>
+ <summary>Launch email client</summary>
+ <description>Binding to launch the email client.</description>
+ </key>
+ <key name="eject" type="s">
+ <default>'XF86Eject'</default>
+ <summary>Eject</summary>
+ <description>Binding to eject an optical disc.</description>
+ </key>
+ <key name="help" type="s">
+ <default>''</default>
+ <summary>Launch help browser</summary>
+ <description>Binding to launch the help browser.</description>
+ </key>
+ <key name="home" type="s">
+ <default>'XF86Explorer'</default>
+ <summary>Home folder</summary>
+ <description>Binding to open the Home folder.</description>
+ </key>
+ <key name="media" type="s">
+ <default>'XF86AudioMedia'</default>
+ <summary>Launch media player</summary>
+ <description>Binding to launch the media player.</description>
+ </key>
+ <key name="next" type="s">
+ <default>'XF86AudioNext'</default>
+ <summary>Next track</summary>
+ <description>Binding to skip to next track.</description>
+ </key>
+ <key name="pause" type="s">
+ <default>'XF86AudioPause'</default>
+ <summary>Pause playback</summary>
+ <description>Binding to pause playback.</description>
+ </key>
+ <key name="play" type="s">
+ <default>'XF86AudioPlay'</default>
+ <summary>Play (or play/pause)</summary>
+ <description>Binding to start playback (or toggle play/pause).</description>
+ </key>
+ <key name="logout" type="s">
+ <default>'<Control><Alt>Delete'</default>
+ <summary>Log out</summary>
+ <description>Binding to log out.</description>
+ </key>
+ <key name="previous" type="s">
+ <default>'XF86AudioPrev'</default>
+ <summary>Previous track</summary>
+ <description>Binding to skip to previous track.</description>
+ </key>
+ <key name="screensaver" type="s">
+ <default>'<Super>l'</default>
+ <summary>Lock screen</summary>
+ <description>Binding to lock the screen.</description>
+ </key>
+ <key name="search" type="s">
+ <default>'XF86Search'</default>
+ <summary>Search</summary>
+ <description>Binding to launch the search tool.</description>
+ </key>
+ <key name="stop" type="s">
+ <default>'XF86AudioStop'</default>
+ <summary>Stop playback</summary>
+ <description>Binding to stop playback.</description>
+ </key>
+ <key name="video-out" type="s">
+ <default>'<Super>p'</default>
+ <summary>Video output</summary>
+ <description>Binding to switch the video output device.</description>
+ </key>
+ <key name="volume-down" type="s">
+ <default>'XF86AudioLowerVolume'</default>
+ <summary>Volume down</summary>
+ <description>Binding to lower the volume.</description>
+ </key>
+ <key name="volume-mute" type="s">
+ <default>'XF86AudioMute'</default>
+ <summary>Volume mute/unmute</summary>
+ <description>Binding to mute/unmute the volume.</description>
+ </key>
+ <key name="volume-up" type="s">
+ <default>'XF86AudioRaiseVolume'</default>
+ <summary>Volume up</summary>
+ <description>Binding to raise the volume.</description>
+ </key>
+ <key name="mic-mute" type="s">
+ <default>'XF86AudioMicMute'</default>
+ <summary>Microphone mute/unmute</summary>
+ <description>Binding to mute/unmute the microphone.</description>
+ </key>
+ <key name="screenshot" type="s">
+ <default>'Print'</default>
+ <summary>Take a screenshot</summary>
+ <description>Binding to take a screenshot.</description>
+ </key>
+ <key name="window-screenshot" type="s">
+ <default>'<Alt>Print'</default>
+ <summary>Take a screenshot of a window</summary>
+ <description>Binding to take a screenshot of a window.</description>
+ </key>
+ <key name="area-screenshot" type="s">
+ <default>'<Shift>Print'</default>
+ <summary>Take a screenshot of an area</summary>
+ <description>Binding to take a screenshot of an area.</description>
+ </key>
+ <key name="screenshot-clip" type="s">
+ <default>'<Ctrl>Print'</default>
+ <summary>Copy a screenshot to clipboard</summary>
+ <description>Binding to copy a screenshot to clipboard.</description>
+ </key>
+ <key name="window-screenshot-clip" type="s">
+ <default>'<Ctrl><Alt>Print'</default>
+ <summary>Copy a screenshot of a window to clipboard</summary>
+ <description>Binding to copy a screenshot of a window to clipboard.</description>
+ </key>
+ <key name="area-screenshot-clip" type="s">
+ <default>'<Ctrl><Shift>Print'</default>
+ <summary>Copy a screenshot of an area to clipboard</summary>
+ <description>Binding to copy a screenshot of an area to clipboard.</description>
+ </key>
+ <key name="screencast" type="s">
+ <default>'<Ctrl><Shift><Alt>R'</default>
+ <summary>Record a short video of the screen</summary>
+ <description>Binding to record a short video of the screen</description>
+ </key>
+ <key name="terminal" type="s">
+ <default>'<Primary><Alt>t'</default>
+ <summary>Launch terminal</summary>
+ <description>Binding to launch the terminal.</description>
+ </key>
+ <key name="www" type="s">
+ <default>'XF86WWW'</default>
+ <summary>Launch web browser</summary>
+ <description>Binding to launch the web browser.</description>
+ </key>
+ <key name="magnifier" type="s">
+ <default>'<Alt><Super>8'</default>
+ <summary>Toggle magnifier</summary>
+ <description>Binding to show the screen magnifier</description>
+ </key>
+ <key name="screenreader" type="s">
+ <default>'<Alt><Super>s'</default>
+ <summary>Toggle screen reader</summary>
+ <description>Binding to start the screen reader</description>
+ </key>
+ <key name="on-screen-keyboard" type="s">
+ <default>''</default>
+ <summary>Toggle on-screen keyboard</summary>
+ <description>Binding to show the on-screen keyboard</description>
+ </key>
+ <key name="increase-text-size" type="s">
+ <default>''</default>
+ <summary>Increase text size</summary>
+ <description>Binding to increase the text size</description>
+ </key>
+ <key name="decrease-text-size" type="s">
+ <default>''</default>
+ <summary>Decrease text size</summary>
+ <description>Binding to decrease the text size</description>
+ </key>
+ <key name="toggle-contrast" type="s">
+ <default>''</default>
+ <summary>Toggle contrast</summary>
+ <description>Binding to toggle the interface contrast</description>
+ </key>
+ <key name="magnifier-zoom-in" type="s">
+ <default>'<Alt><Super>equal'</default>
+ <summary>Magnifier zoom in</summary>
+ <description>Binding for the magnifier to zoom in</description>
+ </key>
+ <key name="magnifier-zoom-out" type="s">
+ <default>'<Alt><Super>minus'</default>
+ <summary>Magnifier zoom out</summary>
+ <description>Binding for the magnifier to zoom out</description>
+ </key>
+ <key name="max-screencast-length" type="u">
+ <default>30</default>
+ <summary>Maximum length of screen recordings</summary>
+ <description>The maximum length of single screen cast recordings in seconds or 0 for unlimited</description>
+ </key>
+ </schema>
+
+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding">
+ <key name="name" type="s">
+ <default>''</default>
+ <summary>Name</summary>
+ <description>Name of the custom binding</description>
+ </key>
+ <key name="binding" type="s">
+ <default>''</default>
+ <summary>Binding</summary>
+ <description>Binding for the custom binding</description>
+ </key>
+ <key name="command" type="s">
+ <default>''</default>
+ <summary>Command</summary>
+ <description>Command to run when the binding is invoked</description>
+ </key>
+ </schema>
+</schemalist>
=== modified file 'debian/control'
--- debian/control 2019-01-09 16:46:14 +0000
+++ debian/control 2019-09-04 12:49:16 +0000
@@ -58,6 +58,7 @@
accountsservice (>= 0.6.34),
gsettings-desktop-schemas (>= 3.15.4),
nautilus-data (>= 2.91.3-1),
+ unity-settings-daemon-schemas (>= ${source:Version}),
gnome-settings-daemon-common (>= 3.16),
gsettings-ubuntu-schemas (>= 0.0.7+17.10.20170922),
Recommends: ibus (>= 1.5.0),
@@ -103,6 +104,15 @@
Description: Headers for building applications communicating with unity-settings-daemon
This package contains header files required to build applications that
communicate with the Unity settings daemon over D-Bus.
+
+Package: unity-settings-daemon-schemas
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: gnome-settings-daemon (<< 3.20.1-2ubuntu1~)
+Breaks: gnome-settings-daemon (<< 3.20.1-2ubuntu1~)
+Description: Shared schemas for gnome-settings-daemon
+ This package contains the gsettings schemas used by
+ unity-settings-daemon.
Package: libunity-settings-daemon1
Architecture: any
=== added file 'debian/unity-settings-daemon-schemas.install'
--- debian/unity-settings-daemon-schemas.install 1970-01-01 00:00:00 +0000
+++ debian/unity-settings-daemon-schemas.install 2019-09-04 12:49:16 +0000
@@ -0,0 +1,1 @@
+debian/*/usr/share/glib-*/schemas/*
=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c 2016-10-03 09:57:23 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c 2019-09-04 12:49:16 +0000
@@ -685,7 +685,7 @@
g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
num_lock_state_to_string (numlock_state),
num_lock_state_to_string (manager->priv->old_state));
- g_settings_set_enum (manager->priv->settings,
+ g_settings_set_enum (manager->priv->gsettings,
KEY_NUMLOCK_STATE,
numlock_state);
manager->priv->old_state = numlock_state;
@@ -1793,9 +1793,9 @@
gboolean rnumlock;
g_debug ("Applying the num-lock settings");
- settings = manager->priv->settings;
+ settings = manager->priv->gsettings;
rnumlock = g_settings_get_boolean (settings, KEY_REMEMBER_NUMLOCK_STATE);
- manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
+ manager->priv->old_state = g_settings_get_enum (manager->priv->gsettings, KEY_NUMLOCK_STATE);
gdk_error_trap_push ();
if (rnumlock) {
@@ -2629,7 +2629,8 @@
GsdSettingsMigrateEntry entries[] = {
{ "repeat", "repeat", NULL },
{ "repeat-interval", "repeat-interval", NULL },
- { "delay", "delay", NULL }
+ { "delay", "delay", NULL },
+ { "remember-numlock-state", "remember-numlock-state", NULL },
};
gsd_settings_migrate_check ("org.gnome.settings-daemon.peripherals.keyboard.deprecated",
=== modified file 'plugins/media-keys/shortcuts-list.h'
--- plugins/media-keys/shortcuts-list.h 2014-03-14 06:27:10 +0000
+++ plugins/media-keys/shortcuts-list.h 2019-09-04 12:49:16 +0000
@@ -24,7 +24,7 @@
#include "shell-keybinding-modes.h"
#include "gsd-keygrab.h"
-#define SETTINGS_BINDING_DIR "org.gnome.settings-daemon.plugins.media-keys"
+#define SETTINGS_BINDING_DIR "com.canonical.unity.settings-daemon.plugins.media-keys"
#define INPUT_SETTINGS_BINDING_DIR "org.gnome.desktop.wm.keybindings"
typedef enum {
=== modified file 'plugins/mouse/gsd-mouse-manager.c'
--- plugins/mouse/gsd-mouse-manager.c 2015-10-07 16:32:40 +0000
+++ plugins/mouse/gsd-mouse-manager.c 2019-09-04 12:49:16 +0000
@@ -57,7 +57,7 @@
#define GSD_MOUSE_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUSE_MANAGER, GsdMouseManagerPrivate))
-#define GSD_SETTINGS_MOUSE_SCHEMA "org.gnome.settings-daemon.peripherals.mouse"
+#define GNOME_DESKTOP_INTERFACE_DIR "org.gnome.desktop.interface"
#define GSETTINGS_MOUSE_SCHEMA "org.gnome.desktop.peripherals.mouse"
#define GSETTINGS_TOUCHPAD_SCHEMA "org.gnome.desktop.peripherals.touchpad"
@@ -82,7 +82,7 @@
GSettings *touchpad_settings;
GSettings *mouse_settings;
GSettings *mouse_a11y_settings;
- GSettings *gsd_mouse_settings;
+ GSettings *interface_settings;
GdkDeviceManager *device_manager;
guint device_added_id;
guint device_removed_id;
@@ -851,7 +851,7 @@
manager->priv->locate_pointer_spawned = (error == NULL);
if (error) {
- g_settings_set_boolean (manager->priv->gsd_mouse_settings, KEY_LOCATE_POINTER, FALSE);
+ g_settings_set_boolean (manager->priv->interface_settings, KEY_LOCATE_POINTER, FALSE);
g_error_free (error);
}
@@ -1223,8 +1223,8 @@
set_devicepresence_handler (manager);
- manager->priv->gsd_mouse_settings = g_settings_new (GSD_SETTINGS_MOUSE_SCHEMA);
- g_signal_connect (manager->priv->gsd_mouse_settings, "changed",
+ manager->priv->interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_DIR);
+ g_signal_connect (manager->priv->interface_settings, "changed",
G_CALLBACK (mouse_callback), manager);
manager->priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
@@ -1241,7 +1241,7 @@
manager->priv->syndaemon_spawned = FALSE;
- set_locate_pointer (manager, g_settings_get_boolean (manager->priv->gsd_mouse_settings, KEY_LOCATE_POINTER));
+ set_locate_pointer (manager, g_settings_get_boolean (manager->priv->interface_settings, KEY_LOCATE_POINTER));
set_mousetweaks_daemon (manager,
g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_DWELL_CLICK_ENABLED),
g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_SECONDARY_CLICK_ENABLED));
@@ -1326,6 +1326,8 @@
g_clear_object (&p->touchpad_settings);
set_locate_pointer (manager, FALSE);
+
+ g_clear_object (&p->interface_settings);
}
static void
--
ubuntu-desktop mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
