Fix compilation warnings

diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c
index 96d68855d5346e47649bbfaa1734b35d997a0611..85bc3db002fba14bc16ac42e5ec585a6b49affd3 100644 (file)
--- a/champlain/champlain-marker.c
+++ b/champlain/champlain-marker.c
@@ -177,7 +177,7 @@ champlain_marker_class_init (ChamplainMarkerClass *champlainMarkerClass)
 static void
 champlain_marker_init (ChamplainMarker *champlainMarker)
 {
-  ChamplainMarkerPrivate *priv = CHAMPLAIN_MARKER_GET_PRIVATE (champlainMarker);
+  //ChamplainMarkerPrivate *priv = CHAMPLAIN_MARKER_GET_PRIVATE (champlainMarker);
 }
 
 
@@ -189,7 +189,7 @@ champlain_marker_init (ChamplainMarker *champlainMarker)
  * Since: 0.2
  */
 ClutterActor *
-champlain_marker_new ()
+champlain_marker_new (void)
 {
   ChamplainMarker *marker;
 

diff --git a/champlain/champlain-marker.h b/champlain/champlain-marker.h
index cc5a9ed328cf40d8c599a780ae698716a390c422..fb0c7ee53f41910c0e2f7495980742e09a8065eb 100644 (file)
--- a/champlain/champlain-marker.h
+++ b/champlain/champlain-marker.h
@@ -52,7 +52,7 @@ struct _ChamplainMarkerClass
 
 GType champlain_marker_get_type (void);
 
-ClutterActor *champlain_marker_new ();
+ClutterActor *champlain_marker_new (void);
 
 void champlain_marker_set_position (ChamplainMarker *marker,
     gdouble longitude, gdouble latitude);

diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 6fb93c1ce29be96367d2418ec6e340ec1bc1c3fe..713a81037c7b9f119a07119bfa5ce1477923030b 100644 (file)
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -49,6 +49,9 @@
 
 #include "champlain-view.h"
 
+#define DEBUG_FLAG CHAMPLAIN_DEBUG_VIEW
+#include "champlain-debug.h"
+
 #include "champlain.h"
 #include "champlain-defines.h"
 #include "champlain-enum-types.h"
@@ -161,8 +164,6 @@ static void view_tiles_reposition (ChamplainView* view);
 static gdouble
 viewport_get_longitude_at (ChamplainViewPrivate *priv, gint x)
 {
-  gint level;
-
   if (!priv->map_source)
     return 0.0;
 
@@ -183,8 +184,6 @@ viewport_get_current_longitude (ChamplainViewPrivate *priv)
 static gdouble
 viewport_get_latitude_at (ChamplainViewPrivate *priv, gint y)
 {
-  gint level;
-
   if (!priv->map_source)
     return 0.0;
 
@@ -275,7 +274,6 @@ marker_reposition_cb (ChamplainMarker *marker,
   ChamplainViewPrivate *priv = GET_PRIVATE (view);
   ChamplainMarkerPrivate *marker_priv = CHAMPLAIN_MARKER_GET_PRIVATE (marker);
 
-  gint level;
   gint x, y;
 
   if (priv->map)
@@ -373,7 +371,6 @@ resize_viewport (ChamplainView *view)
   gdouble lower, upper;
   gboolean center = FALSE;
   TidyAdjustment *hadjust, *vadjust;
-  gint level;
 
   ChamplainViewPrivate *priv = GET_PRIVATE (view);
 
@@ -451,7 +448,7 @@ champlain_view_get_property (GObject *object,
         break;
       case PROP_DECEL_RATE:
         {
-          gdouble decel;
+          gdouble decel = 0.0;
           g_object_get (priv->finger_scroll, "decel-rate", decel, NULL);
           g_value_set_double (value, decel);
           break;
@@ -858,7 +855,7 @@ finger_scroll_button_press_cb (ClutterActor *actor,
  * Since: 0.4
  */
 ClutterActor *
-champlain_view_new ()
+champlain_view_new (void)
 {
   return g_object_new (CHAMPLAIN_TYPE_VIEW, NULL);
 }
@@ -881,7 +878,6 @@ champlain_view_center_on (ChamplainView *view,
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
   gint x, y;
-  guint i;
   ChamplainViewPrivate *priv = GET_PRIVATE (view);
 
   priv->longitude = longitude;

diff --git a/champlain/champlain-view.h b/champlain/champlain-view.h
index 56a3507a9b2a1a181fdd26554ac53c5bb7527fd3..177740455120a5f616f04fb87804ccbc9e23eada 100644 (file)
--- a/champlain/champlain-view.h
+++ b/champlain/champlain-view.h
@@ -67,7 +67,7 @@ struct _ChamplainViewClass
 
 GType champlain_view_get_type (void);
 
-ClutterActor *champlain_view_new ();
+ClutterActor *champlain_view_new (void);
 
 void champlain_view_center_on (ChamplainView *view, gdouble latitude, gdouble longitude);