Fix warnings

diff --git a/champlain/champlain-layer.c b/champlain/champlain-layer.c
index e1e212748081b161c0fe943b7823f8b2ce5831f4..837bcdef51bac5f1d8670de6d0f8c8324a9fd2c3 100644 (file)
--- 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 1f8b0135a5fd6c9c06b483aa4c10100cd4500495..7cdf28defb0b6d00041f959d39af3774fba29b83 100644 (file)
--- 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 6a0902e71bd267c42ab1f45813d523a545f1eeec..4192da6bdac33498fcbf27238a4614fb20256b74 100644 (file)
--- 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 0f346a98876f38bf19fe162b8583e43b98cf1941..67cbb626237d25eb992d97da8ecf83762de3507b 100644 (file)
--- 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);