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
=== modified file 'debian/rules'
--- debian/rules 2021-04-14 15:32:33 +0000
+++ debian/rules 2021-07-14 10:32:46 +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 21.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 21.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/mouse/gnome-mouse-properties.c'
--- panels/mouse/gnome-mouse-properties.c 2020-03-01 17:27:09 +0000
+++ panels/mouse/gnome-mouse-properties.c 2021-07-14 10:32:46 +0000
@@ -49,6 +49,7 @@
49static GSettings *mouse_settings = NULL;49static GSettings *mouse_settings = NULL;
50static GSettings *gsd_mouse_settings = NULL;50static GSettings *gsd_mouse_settings = NULL;
51static GSettings *touchpad_settings = NULL;51static GSettings *touchpad_settings = NULL;
52static GSettings *usd_touchpad_settings = NULL;
52static GdkDeviceManager *device_manager = NULL;53static GdkDeviceManager *device_manager = NULL;
53static guint device_added_id = 0;54static guint device_added_id = 0;
54static guint device_removed_id = 0;55static guint device_removed_id = 0;
@@ -67,7 +68,7 @@
67 GsdTouchpadScrollMethod method;68 GsdTouchpadScrollMethod method;
68 gboolean active;69 gboolean active;
6970
70 method = g_settings_get_enum (touchpad_settings, "scroll-method");71 method = g_settings_get_enum (usd_touchpad_settings, "scroll-method");
71 active = (method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING);72 active = (method == GSD_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING);
72 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("two_finger_scroll_toggle")), active);73 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("two_finger_scroll_toggle")), active);
73}74}
@@ -85,7 +86,7 @@
85 else86 else
86 method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;87 method = GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING;
8788
88 g_settings_set_enum (touchpad_settings, "scroll-method", method);89 g_settings_set_enum (usd_touchpad_settings, "scroll-method", method);
89}90}
9091
91static void92static void
@@ -297,6 +298,7 @@
297 mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");298 mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
298 gsd_mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");299 gsd_mouse_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.mouse");
299 touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");300 touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
301 usd_touchpad_settings = g_settings_new ("com.canonical.unity.settings-daemon.peripherals.touchpad");
300302
301 device_manager = gdk_display_get_device_manager (gdk_display_get_default ());303 device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
302 device_added_id = g_signal_connect (device_manager, "device-added",304 device_added_id = g_signal_connect (device_manager, "device-added",
@@ -325,6 +327,10 @@
325 g_object_unref (touchpad_settings);327 g_object_unref (touchpad_settings);
326 touchpad_settings = NULL;328 touchpad_settings = NULL;
327 }329 }
330 if (usd_touchpad_settings != NULL) {
331 g_object_unref (usd_touchpad_settings);
332 usd_touchpad_settings = NULL;
333 }
328 if (device_manager != NULL) {334 if (device_manager != NULL) {
329 g_signal_handler_disconnect (device_manager, device_added_id);335 g_signal_handler_disconnect (device_manager, device_added_id);
330 device_added_id = 0;336 device_added_id = 0;

Subscribers

People subscribed via source and target branches