Unity Control Center

Merge lp:~khurshid-alam/unity-control-center/gds-to-usd-impish into lp:unity-control-center

  1. gds-to-usd-impish
  2. Merge into trunk
Proposed by Khurshid Alam
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 12930
Merged at revision: 12930
Proposed branch: lp:~khurshid-alam/unity-control-center/gds-to-usd-impish
Merge into: lp:unity-control-center
Diff against target: 60 lines (+9/-3)
2 files modified
debian/rules (+1/-1)
panels/mouse/gnome-mouse-properties.c (+8/-2)
To merge this branch: bzr merge lp:~khurshid-alam/unity-control-center/gds-to-usd-impish
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+405684@code.launchpad.net

Commit message

* Port removed gsettings-desktop-schemas into usd schemas. LP: #1933646

* Update unity-control-center version to 21.10

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2021-04-14 15:32:33 +0000
3+++ debian/rules 2021-07-14 10:32:46 +0000
4@@ -18,6 +18,6 @@
5 DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4
6
7 binary-post-install/unity-control-center::
8- ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 21.04" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
9+ ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 21.10" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png
10
11 common-binary-post-install-arch:: list-missing
12
13=== modified file 'panels/mouse/gnome-mouse-properties.c'
14--- panels/mouse/gnome-mouse-properties.c 2020-03-01 17:27:09 +0000
15+++ panels/mouse/gnome-mouse-properties.c 2021-07-14 10:32:46 +0000
16@@ -49,6 +49,7 @@
17 static GSettings *mouse_settings = NULL;
18 static GSettings *gsd_mouse_settings = NULL;
19 static GSettings *touchpad_settings = NULL;
20+static GSettings *usd_touchpad_settings = NULL;
21 static GdkDeviceManager *device_manager = NULL;
22 static guint device_added_id = 0;
23 static guint device_removed_id = 0;
24@@ -67,7 +68,7 @@
25 GsdTouchpadScrollMethod method;
26 gboolean active;
27
28- method = g_settings_get_enum (touchpad_settings, "scroll-method");
29+ method = g_settings_get_enum (usd_touchpad_settings, "scroll-method");
30 active = (method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING);
31 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("two_finger_scroll_toggle")), active);
32 }
33@@ -85,7 +86,7 @@
34 else
35 method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;
36
37- g_settings_set_enum (touchpad_settings, "scroll-method", method);
38+ g_settings_set_enum (usd_touchpad_settings, "scroll-method", method);
39 }
40
41 static void
42@@ -297,6 +298,7 @@
43 mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
44 gsd_mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");
45 touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
46+ usd_touchpad_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.touchpad");
47
48 device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
49 device_added_id = g_signal_connect (device_manager, "device-added",
50@@ -325,6 +327,10 @@
51 g_object_unref (touchpad_settings);
52 touchpad_settings = NULL;
53 }
54+ if (usd_touchpad_settings != NULL) {
55+ g_object_unref (usd_touchpad_settings);
56+ usd_touchpad_settings = NULL;
57+ }
58 if (device_manager != NULL) {
59 g_signal_handler_disconnect (device_manager, device_added_id);
60 device_added_id = 0;

Subscribers

People subscribed via source and target branches