Fix merge

Author: lenemter

src/Gestures/GestureController.vala

@@ -141,7 +141,7 @@ public class Gala.GestureController : Object {
                 direction_multiplier = -1;
             }
 
-            if (snap && !AnimationsSettings.get_enable_animations ()) {
+            if (snap && !Meta.Prefs.get_gnome_animations ()) {
                 prepare ();
                 finish (0, progress + direction_multiplier);
                 recognizing = false;
@@ -231,7 +231,7 @@ public class Gala.GestureController : Object {
             return;
         }
 
-        if (!AnimationsSettings.get_enable_animations ()) {
+        if (!Meta.Prefs.get_gnome_animations ()) {
             progress = clamped_to;
             target.propagate (END, action, calculate_bounded_progress ());
             return;

src/Widgets/WindowClone.vala

@@ -247,7 +247,7 @@ public class Gala.WindowClone : ActorTarget {
 
         if (animate) {
             save_easing_state ();
-            set_easing_duration (AnimationsSettings.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
+            set_easing_duration (Utils.get_animation_duration (MultitaskingView.ANIMATION_DURATION));
             set_easing_mode (EASE_OUT_QUAD);
         }
 

src/Zoom.vala

@@ -63,7 +63,7 @@ public class Gala.Zoom : Object, GestureTarget {
 
     [CCode (instance_pos = -1)]
     private void zoom_in (Meta.Display display, Meta.Window? window,
-        Clutter.KeyEvent event, Meta.KeyBinding binding) 
+        Clutter.KeyEvent event, Meta.KeyBinding binding) {
         zoom (SHORTCUT_DELTA, true);
     }
 
@@ -109,7 +109,7 @@ public class Gala.Zoom : Object, GestureTarget {
 
             case UPDATE:
                 var target_zoom = (float) progress * 10 + 1;
-                if (!AnimationsSettings.get_enable_animations ()) {
+                if (!Meta.Prefs.get_gnome_animations ()) {
                     var delta = target_zoom - current_zoom;
                     if (delta.abs () >= SHORTCUT_DELTA - float.EPSILON) {
                         target_zoom = current_zoom + ((delta > 0) ? SHORTCUT_DELTA : -SHORTCUT_DELTA);