From 208c3fe0b1dace51a933e0e27832a488b42e640f Mon Sep 17 00:00:00 2001
From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Mon, 9 Mar 2009 00:44:35 +0200
Subject: [PATCH] Fix warnings

---
 champlain/champlain-layer.c      | 6 +++---
 champlain/champlain-map.c        | 2 +-
 champlain/champlain-map.h        | 2 +-
 champlain/champlain-zoom-level.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/champlain/champlain-layer.c b/champlain/champlain-layer.c
index e1e2127..837bcde 100644
--- a/champlain/champlain-layer.c
+++ b/champlain/champlain-layer.c
@@ -61,7 +61,7 @@ champlain_layer_get_property (GObject *object,
                              GValue *value,
                              GParamSpec *pspec)
 {
-  ChamplainLayer *self = CHAMPLAIN_LAYER (object);
+  //ChamplainLayer *self = CHAMPLAIN_LAYER (object);
   switch (property_id)
     {
       default:
@@ -75,7 +75,7 @@ champlain_layer_set_property (GObject *object,
                              const GValue *value,
                              GParamSpec *pspec)
 {
-  ChamplainLayer *self = CHAMPLAIN_LAYER (object);
+  //ChamplainLayer *self = CHAMPLAIN_LAYER (object);
   switch (property_id)
     {
       default:
@@ -86,7 +86,7 @@ champlain_layer_set_property (GObject *object,
 static void
 champlain_layer_dispose (GObject *object)
 {
-  ChamplainLayerPrivate *priv = GET_PRIVATE (object);
+  //ChamplainLayerPrivate *priv = GET_PRIVATE (object);
 
   G_OBJECT_CLASS (champlain_layer_parent_class)->dispose (object);
 }
diff --git a/champlain/champlain-map.c b/champlain/champlain-map.c
index 1f8b013..7cdf28d 100644
--- a/champlain/champlain-map.c
+++ b/champlain/champlain-map.c
@@ -25,7 +25,7 @@
 #include <math.h>
 
 Map*
-map_new ()
+map_new (void)
 {
   Map *map = g_new0(Map, 1);
 
diff --git a/champlain/champlain-map.h b/champlain/champlain-map.h
index 6a0902e..4192da6 100644
--- a/champlain/champlain-map.h
+++ b/champlain/champlain-map.h
@@ -35,7 +35,7 @@ struct _Map
   ChamplainZoomLevel *previous_level;
 };
 
-Map *map_new ();
+Map *map_new (void);
 
 void map_load_visible_tiles (Map *map, ChamplainView * view, ChamplainMapSource *source, ChamplainRectangle viewport);
 
diff --git a/champlain/champlain-zoom-level.c b/champlain/champlain-zoom-level.c
index 0f346a9..67cbb62 100644
--- a/champlain/champlain-zoom-level.c
+++ b/champlain/champlain-zoom-level.c
@@ -317,7 +317,7 @@ champlain_zoom_level_set_zoom_level (ChamplainZoomLevel *self,
 ClutterActor *
 champlain_zoom_level_get_actor (ChamplainZoomLevel *self)
 {
-  g_return_if_fail (CHAMPLAIN_ZOOM_LEVEL (self));
+  g_return_val_if_fail (CHAMPLAIN_ZOOM_LEVEL (self), NULL);
 
   ChamplainZoomLevelPrivate *priv = GET_PRIVATE (self);
 
-- 
2.39.5