Eliminate some warnings and bump clutter requirement to 1.24

6 files changed, 10 insertions, 10 deletions

diff --git a/README b/README
index c8cf9a8..ae00736 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ libchamplain requires:
   * glib >= 2.10
   * gio >= 2.16
   * gdk >= 3.0
-  * clutter >= 1.12
+  * clutter >= 1.24
   * cairo >= 1.4
   * sqlite >= 3.0
   * libsoup >= 2.42
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 8efaa89..48825a9 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -119,7 +119,7 @@ champlain_map_source_factory_constructor (GType type,
     }
   else
     {
-      retval = g_object_ref (instance);
+      retval = G_OBJECT( g_object_ref (instance));
     }
 
   return retval;
diff --git a/champlain/champlain-path-layer.c b/champlain/champlain-path-layer.c
index 42aeeb0..7b2baa8 100644
--- a/champlain/champlain-path-layer.c
+++ b/champlain/champlain-path-layer.c
@@ -858,7 +858,7 @@ update_surface (ChamplainPathLayer *layer,
       cairo_surface_destroy (new_surface);
     }
   /* When only the right actor is visible, no merging is required */
-  else if (!CLUTTER_ACTOR_IS_VISIBLE (priv->left_actor))
+  else if (!clutter_actor_is_visible (priv->left_actor))
     set_surface (CHAMPLAIN_EXPORTABLE (layer), priv->right_surface);
 }
 
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 4edabef..ccbc5d3 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -1258,7 +1258,7 @@ champlain_view_realized_cb (ChamplainView *view,
 
   ChamplainViewPrivate *priv = view->priv;
   
-  if (!CLUTTER_ACTOR_IS_REALIZED (view))
+  if (!clutter_actor_is_realized (CLUTTER_ACTOR (view)))
     return;
 
   clutter_actor_grab_key_focus (priv->kinetic_scroll);
@@ -1475,7 +1475,7 @@ zoom_gesture_begin_cb (ClutterGestureAction *gesture,
     G_GNUC_UNUSED ClutterActor *actor,
     G_GNUC_UNUSED gpointer user_data)
 {
-  ClutterEvent *event = clutter_gesture_action_get_last_event (gesture, 0);
+  const ClutterEvent *event = clutter_gesture_action_get_last_event (gesture, 0);
   ClutterInputDevice *device = clutter_event_get_source_device (event);
 
   /* Give up on >2 finger input and when using mouse */
@@ -3378,7 +3378,7 @@ champlain_view_set_horizontal_wrap (ChamplainView *view,
  *
  * Returns the value of the #ChamplainView:horizontal-wrap property.
  *
- * Returns: (transfer none): %TRUE if #ChamplainView:horizontal-wrap is set.
+ * Returns: %TRUE if #ChamplainView:horizontal-wrap is set.
  *
  */
 gboolean
@@ -3641,14 +3641,14 @@ view_set_zoom_level_at (ChamplainView *view,
     }
 
   /* don't do anything when view not yet realized */
-  if (CLUTTER_ACTOR_IS_REALIZED (view))
+  if (clutter_actor_is_realized (CLUTTER_ACTOR (view)))
     show_zoom_actor (view, zoom_level, offset_x, offset_y);
 
   get_x_y_for_zoom_level (view, zoom_level, offset_x, offset_y, &new_x, &new_y);
 
   priv->zoom_level = zoom_level;
 
-  if (CLUTTER_ACTOR_IS_REALIZED (view))
+  if (clutter_actor_is_realized (CLUTTER_ACTOR (view)))
     {
       resize_viewport (view);
       remove_all_tiles (view);
diff --git a/configure.ac b/configure.ac
index cd57b03..20ec2ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ PKG_CHECK_MODULES(DEPS,
   [   glib-2.0 >= 2.16
       gobject-2.0 >= 2.10
       gdk-3.0 >= 2.90
-      clutter-1.0 >= 1.12
+      clutter-1.0 >= 1.24
       cairo >= 1.4
       gio-2.0 >= 2.16
       sqlite3 >= 3.0
diff --git a/demos/url-marker.c b/demos/url-marker.c
index 73a13dd..d79ab06 100644
--- a/demos/url-marker.c
+++ b/demos/url-marker.c
@@ -239,7 +239,7 @@ main (int argc, char *argv[])
   /* Create the markers and marker layer */
   layer = champlain_marker_layer_new_full (CHAMPLAIN_SELECTION_SINGLE);
   champlain_view_add_layer (CHAMPLAIN_VIEW (view), CHAMPLAIN_LAYER (layer));
-  session = soup_session_async_new ();
+  session = soup_session_new ();
   create_marker_from_url (layer, session, 48.218611, 17.146397,
       "http://hexten.net/cpan-faces/potyl.jpg");
   create_marker_from_url (layer, session, 48.21066, 16.31476,