Merge lp:~darkxst/unity-control-center/gsettings3.16 into lp:unity-control-center

[Tim Lunn]

Cherry-pick upstream changes for relocated peripheral settings

=== modified file 'configure.ac'
--- configure.ac	2015-02-12 14:09:23 +0000
+++ configure.ac	2015-07-19 03:33:47 +0000
@@ -116,7 +116,7 @@
 NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
 GNOME_DESKTOP_REQUIRED_VERSION=3.5.91
-SCHEMAS_REQUIRED_VERSION=3.7.2.2
+SCHEMAS_REQUIRED_VERSION=3.15.4
 LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
 GOA_REQUIRED_VERSION=3.5.90
 
=== modified file 'debian/control'
--- debian/control	2015-03-12 19:18:11 +0000
+++ debian/control	2015-07-19 03:33:47 +0000
@@ -14,7 +14,7 @@
                gnome-pkg-tools (>= 0.10),
                unity-settings-daemon-dev,
                libunity-settings-daemon-dev,
-               gsettings-desktop-schemas-dev (>= 3.7.2.2),
+               gsettings-desktop-schemas-dev (>= 3.15.4),
                hardening-wrapper,
                intltool (>= 0.37.1),
                libaccountsservice-dev (>= 0.6.30),
@@ -73,7 +73,8 @@
          adwaita-icon-theme,
          gnome-menus (>= 2.12.0),
          unity-settings-daemon,
-         gsettings-desktop-schemas (>= 3.5.91),
+         gnome-settings-daemon-schemas (>= 3.16),
+         gsettings-desktop-schemas (>= 3.15.4),
          gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
          ibus,
          indicator-bluetooth,
 
=== modified file 'panels/keyboard/keyboard-general.c'
--- panels/keyboard/keyboard-general.c	2011-09-08 16:23:22 +0000
+++ panels/keyboard/keyboard-general.c	2015-07-19 03:33:47 +0000
@@ -76,7 +76,7 @@
 keyboard_general_init (CcPanel *panel, GtkBuilder *builder)
 {
   if (keyboard_settings == NULL)
-    keyboard_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.keyboard");
+    keyboard_settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
 
   if (interface_settings == NULL)
     interface_settings = g_settings_new ("org.gnome.desktop.interface");
 
=== modified file 'panels/mouse/gnome-mouse-properties.c'
--- panels/mouse/gnome-mouse-properties.c	2014-02-07 16:40:25 +0000
+++ panels/mouse/gnome-mouse-properties.c	2015-07-19 03:33:47 +0000
@@ -32,6 +32,8 @@
 #include <unity-settings-daemon/gsd-enums.h>
 #include <math.h>
 
+#include <gdesktop-enums.h>
+
 #include "gnome-mouse-properties.h"
 #include "gsd-input-helper.h"
 
@@ -45,6 +47,7 @@
 #define WID(x) (GtkWidget*) gtk_builder_get_object (dialog, x)
 
 static GSettings *mouse_settings = NULL;
+static GSettings *gsd_mouse_settings = NULL;
 static GSettings *touchpad_settings = NULL;
 static GdkDeviceManager *device_manager = NULL;
 static guint device_added_id = 0;
@@ -134,23 +137,38 @@
 	XFreeDeviceList (devicelist);
 }
 
-static void
-pointer_speed_scale_event (GtkRange *scale, GtkBuilder *dialog)
-{
-	gdouble value;
-	GSettings *settings;
-	GtkAdjustment *adjustment;
-
-	if (GTK_WIDGET (scale) == WID ("pointer_speed_scale"))
-		settings = mouse_settings;
-	else
-		settings = touchpad_settings;
-
-	g_settings_set_double (settings, "motion-acceleration", gtk_range_get_value (scale));
-
-	adjustment = gtk_range_get_adjustment (scale);
-	value = gtk_adjustment_get_upper (adjustment) - gtk_range_get_value (scale) + 1;
-	g_settings_set_int (settings, "motion-threshold", value);
+static gboolean
+get_touchpad_enabled (GSettings *settings)
+ {
+        GDesktopDeviceSendEvents send_events;
+
+        send_events = g_settings_get_enum (settings, "send-events");
+
+        return send_events == G_DESKTOP_DEVICE_SEND_EVENTS_ENABLED;
+}
+
+static gboolean
+touchpad_enabled_get_mapping (GValue    *value,
+                              GVariant  *variant,
+                              gpointer   user_data)
+{
+        gboolean enabled;
+
+        enabled = g_strcmp0 (g_variant_get_string (variant, NULL), "enabled") == 0;
+        g_value_set_boolean (value, enabled);
+        return TRUE;
+}
+
+static GVariant *
+touchpad_enabled_set_mapping (const GValue              *value,
+                              const GVariantType        *type,
+                              gpointer                   user_data)
+{
+        gboolean enabled;
+
+        enabled = g_value_get_boolean (value);
+
+        return g_variant_new_string (enabled ? "enabled" : "disabled");
 }
 
 /* Set up the property editors in the dialog. */
@@ -171,7 +189,7 @@
 		G_CALLBACK (orientation_radio_button_release_event), NULL);
 
 	/* Double-click time */
-	g_settings_bind (mouse_settings, "double-click",
+	g_settings_bind (gsd_mouse_settings, "double-click",
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("double_click_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);
 
@@ -179,9 +197,9 @@
 	mouse_present = mouse_is_present ();
 	gtk_widget_set_visible (WID ("mouse_vbox"), mouse_present);
 
-	g_signal_connect (WID ("pointer_speed_scale"), "value-changed",
-			  G_CALLBACK (pointer_speed_scale_event), dialog);
-	g_settings_bind (mouse_settings, "motion-acceleration",
+	gtk_scale_add_mark (GTK_SCALE (WID ("pointer_speed_scale")), 0,
+			    GTK_POS_TOP, NULL);
+	g_settings_bind (mouse_settings, "speed",
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("pointer_speed_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);
 
@@ -189,29 +207,31 @@
 	touchpad_present = touchpad_is_present ();
 	gtk_widget_set_visible (WID ("touchpad_vbox"), touchpad_present);
 
-	g_settings_bind (touchpad_settings, "touchpad-enabled",
-			 WID ("touchpad_enabled_switch"), "active",
-			 G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (touchpad_settings, "touchpad-enabled",
-			 WID ("touchpad_options_box"), "sensitive",
-			 G_SETTINGS_BIND_GET);
+	g_settings_bind_with_mapping (touchpad_settings, "send-events",
+				      WID ("touchpad_enabled_switch"), "active",
+				      G_SETTINGS_BIND_DEFAULT,
+				      touchpad_enabled_get_mapping,
+				      touchpad_enabled_set_mapping,
+				      NULL, NULL);
+	g_settings_bind_with_mapping (touchpad_settings, "send-events",
+				      WID ("touchpad_options_box"), "sensitive",
+				      G_SETTINGS_BIND_GET,
+				      touchpad_enabled_get_mapping,
+				      touchpad_enabled_set_mapping,
+				      NULL, NULL);
 
-	g_settings_bind (touchpad_settings, "disable-while-typing",
-			 WID ("disable_w_typing_toggle"), "active",
-			 G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (touchpad_settings, "tap-to-click",
 			 WID ("tap_to_click_toggle"), "active",
 			 G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (touchpad_settings, "natural-scroll",
 			 WID ("natural_scroll_toggle"), "active",
 			 G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (touchpad_settings, "motion-acceleration",
+	gtk_scale_add_mark (GTK_SCALE (WID ("touchpad_pointer_speed_scale")), 0,
+			    GTK_POS_TOP, NULL);
+	g_settings_bind (touchpad_settings, "speed",
 			 gtk_range_get_adjustment (GTK_RANGE (WID ("touchpad_pointer_speed_scale"))), "value",
 			 G_SETTINGS_BIND_DEFAULT);
 
-	g_signal_connect (WID ("touchpad_pointer_speed_scale"), "value-changed",
-			  G_CALLBACK (pointer_speed_scale_event), dialog);
-
 	if (touchpad_present) {
 		synaptics_check_capabilities (dialog);
 		setup_scrollmethod_radios (dialog);
@@ -273,8 +293,10 @@
 GtkWidget *
 gnome_mouse_properties_init (GtkBuilder *dialog)
 {
-	mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
-	touchpad_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.touchpad");
+
+	mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
+	gsd_mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
+	touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
 
 	device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
 	device_added_id = g_signal_connect (device_manager, "device-added",
@@ -295,6 +317,10 @@
 		g_object_unref (mouse_settings);
 		mouse_settings = NULL;
 	}
+	if (gsd_mouse_settings != NULL) {
+		g_object_unref (gsd_mouse_settings);
+		mouse_settings = NULL;
+	}
 	if (touchpad_settings != NULL) {
 		g_object_unref (touchpad_settings);
 		touchpad_settings = NULL;
 
=== modified file 'panels/mouse/gnome-mouse-properties.ui'
--- panels/mouse/gnome-mouse-properties.ui	2013-11-28 06:07:03 +0000
+++ panels/mouse/gnome-mouse-properties.ui	2015-07-19 03:33:47 +0000
@@ -2,18 +2,16 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">1</property>
-    <property name="upper">10</property>
-    <property name="value">6</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
+    <property name="lower">-1</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.2</property>
+    <property name="page_increment">0.2</property>
   </object>
   <object class="GtkAdjustment" id="adjustment11">
-    <property name="lower">1</property>
-    <property name="upper">10</property>
-    <property name="value">6</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">1</property>
+    <property name="lower">-1</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.2</property>
+    <property name="page_increment">0.2</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
     <property name="lower">100</property>
@@ -72,6 +70,7 @@
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
+
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -356,12 +355,12 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHScale" id="pointer_speed_scale">
+                                  <object class="GtkScale" id="pointer_speed_scale">
+                                    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="adjustment">adjustment1</property>
                                     <property name="draw_value">False</property>
-                                    <property name="value_pos">right</property>
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
@@ -540,12 +539,12 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkHScale" id="touchpad_pointer_speed_scale">
+                                      <object class="GtkScale" id="touchpad_pointer_speed_scale">
+                                        <property name="orientation">horizontal</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="adjustment">adjustment11</property>
                                         <property name="draw_value">False</property>
-                                        <property name="value_pos">right</property>
                                       </object>
                                       <packing>
                                         <property name="expand">True</property>
@@ -592,28 +591,6 @@
                                 <property name="row_spacing">5</property>
                                 <property name="column_spacing">10</property>
                                 <child>
-                                  <object class="GtkCheckButton" id="disable_w_typing_toggle">
-                                    <property name="label" translatable="yes">Disable while _typing</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="relief">none</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <object class="GtkCheckButton" id="tap_to_click_toggle">
                                     <property name="label" translatable="yes">Tap to _click</property>
                                     <property name="use_action_appearance">False</property>
@@ -629,7 +606,7 @@
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="top_attach">0</property>
                                     <property name="width">1</property>
                                     <property name="height">1</property>
                                   </packing>