[gnome-photos] preview-view, utils, zool-controls: Simplify code

[Debarshi Ray <debarshir src gnome org>]

commit debe8b682b4e27f3878614abc3dfdb0dd84e092f
Author: Debarshi Ray <debarshir gnome org>
Date:   Sun Dec 3 14:30:29 2017 +0100

    preview-view, utils, zool-controls: Simplify code
    
    Assert the post-condition in the function itself, instead of having
    each caller do so.

 src/photos-preview-view.c  |    9 ---------
 src/photos-utils.c         |    1 +
 src/photos-zoom-controls.c |    2 --
 3 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index f753b22..f31c1bd 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -262,8 +262,6 @@ photos_preview_view_gesture_zoom_begin (PhotosPreviewView *self)
   gtk_gesture_set_state (gesture_zoom, GTK_EVENT_SEQUENCE_CLAIMED);
 
   parameter = photos_utils_create_zoom_target_value (0.0, PHOTOS_ZOOM_EVENT_TOUCH);
-  g_assert_true (g_variant_is_floating (parameter));
-
   g_action_activate (self->zoom_begin_action, parameter);
 }
 
@@ -274,13 +272,9 @@ photos_preview_view_gesture_zoom_direction_changed (PhotosPreviewView *self)
   GVariant *parameter;
 
   parameter = photos_utils_create_zoom_target_value (0.0, PHOTOS_ZOOM_EVENT_TOUCH);
-  g_assert_true (g_variant_is_floating (parameter));
-
   g_action_activate (self->zoom_end_action, parameter);
 
   parameter = photos_utils_create_zoom_target_value (0.0, PHOTOS_ZOOM_EVENT_TOUCH);
-  g_assert_true (g_variant_is_floating (parameter));
-
   g_action_activate (self->zoom_begin_action, parameter);
 }
 
@@ -291,8 +285,6 @@ photos_preview_view_gesture_zoom_end (PhotosPreviewView *self)
   GVariant *parameter;
 
   parameter = photos_utils_create_zoom_target_value (0.0, PHOTOS_ZOOM_EVENT_TOUCH);
-  g_assert_true (g_variant_is_floating (parameter));
-
   g_action_activate (self->zoom_end_action, parameter);
 }
 
@@ -305,7 +297,6 @@ photos_preview_view_gesture_zoom_scale_changed (PhotosPreviewView *self,
   GVariant *parameter;
 
   parameter = photos_utils_create_zoom_target_value (scale, PHOTOS_ZOOM_EVENT_TOUCH);
-  g_assert_true (g_variant_is_floating (parameter));
 
   switch (direction)
     {
diff --git a/src/photos-utils.c b/src/photos-utils.c
index 8c44c50..0607505 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -426,6 +426,7 @@ photos_utils_create_zoom_target_value (gdouble delta, PhotosZoomEvent event)
   ret_val = g_variant_builder_end (&builder);
 
   g_type_class_unref (zoom_event_class);
+  g_return_val_if_fail (g_variant_is_floating (ret_val), ret_val);
   return ret_val;
 }
 
diff --git a/src/photos-zoom-controls.c b/src/photos-zoom-controls.c
index c3d6620..7e83419 100644
--- a/src/photos-zoom-controls.c
+++ b/src/photos-zoom-controls.c
@@ -78,8 +78,6 @@ photos_zoom_controls_update_buttons (PhotosZoomControls *self)
       GVariant *target_value = NULL;
 
       target_value = photos_utils_create_zoom_target_value (1.0, PHOTOS_ZOOM_EVENT_MOUSE_CLICK);
-      g_assert_true (g_variant_is_floating (target_value));
-
       gtk_actionable_set_action_target_value (GTK_ACTIONABLE (self->zoom_toggle_button), target_value);
       gtk_actionable_set_action_name (GTK_ACTIONABLE (self->zoom_toggle_button), "app.zoom-in");
     }