Unity Control Center

Merge lp:~khurshid-alam/unity-control-center/use-usd-schemas into lp:unity-control-center

  1. use-usd-schemas
  2. Merge into trunk
Proposed by Khurshid Alam
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 12924
Merged at revision: 12923
Proposed branch: lp:~khurshid-alam/unity-control-center/use-usd-schemas
Merge into: lp:unity-control-center
Diff against target: 134 lines (+13/-13)
11 files modified
debian/rules (+1/-1)
panels/keyboard/00-multimedia.xml.in (+1/-1)
panels/keyboard/01-launchers.xml.in (+1/-1)
panels/keyboard/01-screenshot.xml.in (+1/-1)
panels/keyboard/01-system.xml.in (+1/-1)
panels/keyboard/50-accessibility.xml.in (+1/-1)
panels/keyboard/cc-keyboard-item.c (+1/-1)
panels/keyboard/keyboard-shortcuts.c (+2/-2)
panels/region/cc-region-keyboard-item.c (+1/-1)
panels/region/keyboard-shortcuts.c (+2/-2)
panels/universal-access/cc-ua-panel.c (+1/-1)
To merge this branch: bzr merge lp:~khurshid-alam/unity-control-center/use-usd-schemas
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+372174@code.launchpad.net

Commit message

* Port media keys to use com.canonical.unity.settings-daemon. LP: #1842324

* Update version number to 19.10

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

All good

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

Don't you need to update the packaging to depends on unity-settings-daemon-schemas?

review: Needs Information
Revision history for this message
Khurshid Alam (khurshid-alam) wrote :

@seb128

U-c-c pulls unity-settings-daemon and unity-settings-daemon pulls unity-settings-daemon-schemas.

Revision history for this message
Sebastien Bacher (seb128) wrote :

ok, that makes sense then!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2019-03-01 16:13:07 +0000
+++ debian/rules 2019-09-02 23:43:07 +0000
@@ -18,6 +18,6 @@
18DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c418DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
1919
20binary-post-install/unity-control-center::20binary-post-install/unity-control-center::
21 ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 19.04" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png21 ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 19.10" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
2222
23common-binary-post-install-arch:: list-missing23common-binary-post-install-arch:: list-missing
2424
=== modified file 'panels/keyboard/00-multimedia.xml.in'
--- panels/keyboard/00-multimedia.xml.in 2011-02-16 18:00:38 +0000
+++ panels/keyboard/00-multimedia.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8" ?>1<?xml version="1.0" encoding="UTF-8" ?>
2<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Sound and Media">2<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Sound and Media">
33
4 <KeyListEntry name="volume-mute" _description="Volume mute"/>4 <KeyListEntry name="volume-mute" _description="Volume mute"/>
55
66
=== modified file 'panels/keyboard/01-launchers.xml.in'
--- panels/keyboard/01-launchers.xml.in 2013-11-28 04:38:37 +0000
+++ panels/keyboard/01-launchers.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8" ?>1<?xml version="1.0" encoding="UTF-8" ?>
2<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Launchers">2<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Launchers">
33
4 <KeyListEntry name="help" _description="Launch help browser"/>4 <KeyListEntry name="help" _description="Launch help browser"/>
55
66
=== modified file 'panels/keyboard/01-screenshot.xml.in'
--- panels/keyboard/01-screenshot.xml.in 2013-11-28 06:01:16 +0000
+++ panels/keyboard/01-screenshot.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8" ?>1<?xml version="1.0" encoding="UTF-8" ?>
2<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="Screenshots">2<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="Screenshots">
33
4 <KeyListEntry name="screenshot"4 <KeyListEntry name="screenshot"
5 _description="Take a screenshot"/>5 _description="Take a screenshot"/>
66
=== modified file 'panels/keyboard/01-system.xml.in'
--- panels/keyboard/01-system.xml.in 2011-02-16 18:00:38 +0000
+++ panels/keyboard/01-system.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8" ?>1<?xml version="1.0" encoding="UTF-8" ?>
2<KeyListEntries group="system" schema="org.gnome.settings-daemon.plugins.media-keys" _name="System">2<KeyListEntries group="system" schema="com.canonical.unity.settings-daemon.plugins.media-keys" _name="System">
33
4 <KeyListEntry name="logout" _description="Log out"/>4 <KeyListEntry name="logout" _description="Log out"/>
55
66
=== modified file 'panels/keyboard/50-accessibility.xml.in'
--- panels/keyboard/50-accessibility.xml.in 2011-11-09 00:04:50 +0000
+++ panels/keyboard/50-accessibility.xml.in 2019-09-02 23:43:07 +0000
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<KeyListEntries group="system" _name="Universal Access" schema="org.gnome.settings-daemon.plugins.media-keys">2<KeyListEntries group="system" _name="Universal Access" schema="com.canonical.unity.settings-daemon.plugins.media-keys">
33
4 <KeyListEntry name="magnifier" _description="Turn zoom on or off"/>4 <KeyListEntry name="magnifier" _description="Turn zoom on or off"/>
55
66
=== modified file 'panels/keyboard/cc-keyboard-item.c'
--- panels/keyboard/cc-keyboard-item.c 2013-11-28 04:33:09 +0000
+++ panels/keyboard/cc-keyboard-item.c 2019-09-02 23:43:07 +0000
@@ -31,7 +31,7 @@
3131
32#define CC_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_ITEM, CcKeyboardItemPrivate))32#define CC_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_ITEM, CcKeyboardItemPrivate))
3333
34#define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"34#define CUSTOM_KEYS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"
3535
36struct CcKeyboardItemPrivate36struct CcKeyboardItemPrivate
37{37{
3838
=== modified file 'panels/keyboard/keyboard-shortcuts.c'
--- panels/keyboard/keyboard-shortcuts.c 2014-03-14 14:43:48 +0000
+++ panels/keyboard/keyboard-shortcuts.c 2019-09-02 23:43:07 +0000
@@ -28,8 +28,8 @@
28#include "cc-keyboard-option.h"28#include "cc-keyboard-option.h"
29#include "wm-common.h"29#include "wm-common.h"
3030
31#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"31#define BINDINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys"
32#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"32#define CUSTOM_KEYS_BASENAME "/com/canonical/unity/settings-daemon/plugins/media-keys/custom-keybindings"
33#define CUSTOM_SHORTCUTS_ID "custom"33#define CUSTOM_SHORTCUTS_ID "custom"
34#define WID(builder, name) (GTK_WIDGET (gtk_builder_get_object (builder, name)))34#define WID(builder, name) (GTK_WIDGET (gtk_builder_get_object (builder, name)))
3535
3636
=== modified file 'panels/region/cc-region-keyboard-item.c'
--- panels/region/cc-region-keyboard-item.c 2013-11-28 06:02:43 +0000
+++ panels/region/cc-region-keyboard-item.c 2019-09-02 23:43:07 +0000
@@ -31,7 +31,7 @@
3131
32#define CC_REGION_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_KEYBOARD_ITEM, CcRegionKeyboardItemPrivate))32#define CC_REGION_KEYBOARD_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_KEYBOARD_ITEM, CcRegionKeyboardItemPrivate))
3333
34#define CUSTOM_KEYS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"34#define CUSTOM_KEYS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys.custom-keybinding"
3535
36struct CcRegionKeyboardItemPrivate36struct CcRegionKeyboardItemPrivate
37{37{
3838
=== modified file 'panels/region/keyboard-shortcuts.c'
--- panels/region/keyboard-shortcuts.c 2013-11-29 06:28:37 +0000
+++ panels/region/keyboard-shortcuts.c 2019-09-02 23:43:07 +0000
@@ -26,8 +26,8 @@
26#include "keyboard-shortcuts.h"26#include "keyboard-shortcuts.h"
27#include "wm-common.h"27#include "wm-common.h"
2828
29#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys"29#define BINDINGS_SCHEMA "com.canonical.unity.settings-daemon.plugins.media-keys"
30#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"30#define CUSTOM_KEYS_BASENAME "/com/canonical/unity/settings-daemon/plugins/media-keys/custom-keybindings"
31#define CUSTOM_SHORTCUTS_ID "custom"31#define CUSTOM_SHORTCUTS_ID "custom"
3232
33typedef struct {33typedef struct {
3434
=== modified file 'panels/universal-access/cc-ua-panel.c'
--- panels/universal-access/cc-ua-panel.c 2016-10-03 03:43:05 +0000
+++ panels/universal-access/cc-ua-panel.c 2019-09-02 23:43:07 +0000
@@ -716,7 +716,7 @@
716 priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");716 priv->kb_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
717 priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");717 priv->mouse_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
718 priv->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications");718 priv->application_settings = g_settings_new ("org.gnome.desktop.a11y.applications");
719 priv->mediakeys_settings = g_settings_new ("org.gnome.settings-daemon.plugins.media-keys");719 priv->mediakeys_settings = g_settings_new ("com.canonical.unity.settings-daemon.plugins.media-keys");
720 priv->a11y_profile_settings = g_settings_new ("org.gnome.desktop.a11y");720 priv->a11y_profile_settings = g_settings_new ("org.gnome.desktop.a11y");
721 priv->unity_interface_settings = g_settings_new ("com.canonical.Unity.Interface");721 priv->unity_interface_settings = g_settings_new ("com.canonical.Unity.Interface");
722722

Subscribers

People subscribed via source and target branches