diff --git a/daemon/MonitorLabel.vala b/daemon/MonitorLabel.vala index e27cab905..433120189 100644 --- a/daemon/MonitorLabel.vala +++ b/daemon/MonitorLabel.vala @@ -31,8 +31,8 @@ var provider = new Gtk.CssProvider (); try { provider.load_from_string (COLORED_STYLE_CSS.printf (title, info.background_color, info.text_color)); - get_style_context ().add_class (title); - get_style_context ().add_class ("monitor-label"); + add_css_class (title); + add_css_class ("monitor-label"); Gtk.StyleContext.add_provider_for_display ( Gdk.Display.get_default (), diff --git a/lib/Gestures/GestureSettings.vala b/lib/Gestures/GestureSettings.vala index 92355b737..a117ee869 100644 --- a/lib/Gestures/GestureSettings.vala +++ b/lib/Gestures/GestureSettings.vala @@ -34,21 +34,6 @@ private class Gala.GestureSettings : Object { : touchpad_settings.get_boolean ("natural-scroll"); } - public Meta.MotionDirection? get_direction (Gesture gesture) { - switch (gesture.direction) { - case GestureDirection.UP: - return Meta.MotionDirection.UP; - case GestureDirection.DOWN: - return Meta.MotionDirection.DOWN; - case GestureDirection.LEFT: - return Meta.MotionDirection.LEFT; - case GestureDirection.RIGHT: - return Meta.MotionDirection.RIGHT; - default: - return null; - } - } - public Meta.MotionDirection? get_natural_scroll_direction (Gesture gesture) { bool natural_scroll = is_natural_scroll_enabled (gesture.performed_on_device_type); diff --git a/lib/Gestures/ScrollBackend.vala b/lib/Gestures/ScrollBackend.vala index 1cf079293..9c4f1c102 100644 --- a/lib/Gestures/ScrollBackend.vala +++ b/lib/Gestures/ScrollBackend.vala @@ -73,7 +73,7 @@ private class Gala.ScrollBackend : Object, GestureBackend { // Scroll events apply the natural scroll preferences out of the box // Standardize them so the direction matches the physical direction of the gesture and the // GestureTracker user can decide if it wants to follow natural scroll settings or not - bool natural_scroll = settings.is_natural_scroll_enabled (Clutter.InputDeviceType.TOUCHPAD_DEVICE); + bool natural_scroll = GestureSettings.is_natural_scroll_enabled (Clutter.InputDeviceType.TOUCHPAD_DEVICE); if (natural_scroll) { x *= -1; y *= -1; diff --git a/lib/Gestures/ToucheggBackend.vala b/lib/Gestures/ToucheggBackend.vala index 86cfefd11..c280efc09 100644 --- a/lib/Gestures/ToucheggBackend.vala +++ b/lib/Gestures/ToucheggBackend.vala @@ -150,18 +150,6 @@ private class Gala.ToucheggBackend : Object, GestureBackend { new Thread (null, (owned) run); } - public void stop () { - try { - reconnection_attempts = MAX_RECONNECTION_ATTEMPTS; - - if (!connection.closed) { - connection.close_sync (); - } - } catch (Error e) { - // Ignore this error, the process is being killed as this point - } - } - [CCode (instance_pos = -1)] private void on_new_message (DBusConnection connection, string? sender_name, string object_path, string interface_name, string signal_name, Variant parameters) {