Partly fix Bug 577591 – Adopt the new coding style

diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index 852cb0a3c5f53944062c6207afb2cdd71543d5c9..d7c10486fd88a5eaa4b398605eb6bde476f6219e 100644 (file)
--- a/champlain/champlain-map-source.c
+++ b/champlain/champlain-map-source.c
@@ -74,9 +74,9 @@ struct _ChamplainMapSourcePrivate
 
 static void
 champlain_map_source_get_property (GObject *object,
-                                   guint prop_id,
-                                   GValue *value,
-                                   GParamSpec *pspec)
+    guint prop_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(object);
   ChamplainMapSourcePrivate *priv = map_source->priv;
@@ -111,9 +111,9 @@ champlain_map_source_get_property (GObject *object,
 
 static void
 champlain_map_source_set_property (GObject *object,
-                                   guint prop_id,
-                                   const GValue *value,
-                                   GParamSpec *pspec)
+    guint prop_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(object);
   ChamplainMapSourcePrivate *priv = map_source->priv;
@@ -309,8 +309,8 @@ champlain_map_source_get_tile_size (ChamplainMapSource *map_source)
 
 guint
 champlain_map_source_get_x (ChamplainMapSource *map_source,
-                            gint zoom_level,
-                            gdouble longitude)
+    gint zoom_level,
+    gdouble longitude)
 {
   ChamplainMapSourcePrivate *priv = map_source->priv;
   // FIXME: support other projections
@@ -319,8 +319,8 @@ champlain_map_source_get_x (ChamplainMapSource *map_source,
 
 guint
 champlain_map_source_get_y (ChamplainMapSource *map_source,
-                            gint zoom_level,
-                            gdouble latitude)
+    gint zoom_level,
+    gdouble latitude)
 {
   ChamplainMapSourcePrivate *priv = map_source->priv;
   // FIXME: support other projections
@@ -331,7 +331,7 @@ champlain_map_source_get_y (ChamplainMapSource *map_source,
 
 guint
 champlain_map_source_get_row_count (ChamplainMapSource *map_source,
-                                    gint zoom_level)
+    gint zoom_level)
 {
   //ChamplainMapSourcePrivate *priv = map_source->priv;
   // FIXME: support other projections
@@ -340,7 +340,7 @@ champlain_map_source_get_row_count (ChamplainMapSource *map_source,
 
 guint
 champlain_map_source_get_column_count (ChamplainMapSource *map_source,
-                                       gint zoom_level)
+    gint zoom_level)
 {
   //ChamplainMapSourcePrivate *priv = map_source->priv;
   // FIXME: support other projections
@@ -349,9 +349,9 @@ champlain_map_source_get_column_count (ChamplainMapSource *map_source,
 
 void
 champlain_map_source_get_tile (ChamplainMapSource *map_source,
-                               ChamplainView *view,
-                               ChamplainZoomLevel *zoom_level,
-                               ChamplainTile *tile)
+    ChamplainView *view,
+    ChamplainZoomLevel *zoom_level,
+    ChamplainTile *tile)
 {
   g_return_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source));
 
@@ -360,17 +360,17 @@ champlain_map_source_get_tile (ChamplainMapSource *map_source,
 
 void
 champlain_map_source_real_get_tile (ChamplainMapSource *map_source,
-                                    ChamplainView *view,
-                                    ChamplainZoomLevel *zoom_level,
-                                    ChamplainTile *tile)
+    ChamplainView *view,
+    ChamplainZoomLevel *zoom_level,
+    ChamplainTile *tile)
 {
   g_error ("Should not be reached");
 }
 
 gdouble
 champlain_map_source_get_longitude (ChamplainMapSource *map_source,
-                                    gint zoom_level,
-                                    guint x)
+    gint zoom_level,
+    guint x)
 {
   //ChamplainMapSourcePrivate *priv = map_source->priv;
   // FIXME: support other projections
@@ -380,8 +380,8 @@ champlain_map_source_get_longitude (ChamplainMapSource *map_source,
 
 gdouble
 champlain_map_source_get_latitude (ChamplainMapSource *map_source,
-                                   gint zoom_level,
-                                   guint y)
+    gint zoom_level,
+    guint y)
 {
   //ChamplainMapSourcePrivate *priv = map_source->priv;
   // FIXME: support other projections
@@ -399,7 +399,7 @@ champlain_map_source_get_name (ChamplainMapSource *map_source)
 
 void
 champlain_map_source_set_name (ChamplainMapSource *map_source,
-                               const gchar *name)
+    const gchar *name)
 {
   ChamplainMapSourcePrivate *priv = map_source->priv;
 
@@ -415,7 +415,7 @@ champlain_map_source_get_license (ChamplainMapSource *map_source)
 
 void
 champlain_map_source_set_license (ChamplainMapSource *map_source,
-                                  const gchar *license)
+    const gchar *license)
 {
   ChamplainMapSourcePrivate *priv = map_source->priv;
 

diff --git a/champlain/champlain-map-source.h b/champlain/champlain-map-source.h
index 2f8ddd9a4401d6729d072906071aecb227426ea3..8acb402b50776a26c08ab12f79711c6d785b665e 100644 (file)
--- a/champlain/champlain-map-source.h
+++ b/champlain/champlain-map-source.h
@@ -70,16 +70,20 @@ gint champlain_map_source_get_max_zoom_level (ChamplainMapSource *map_source);
 guint champlain_map_source_get_tile_size (ChamplainMapSource *map_source);
 
 guint champlain_map_source_get_x (ChamplainMapSource *map_source,
-    gint zoom_level, gdouble longitude);
+    gint zoom_level,
+    gdouble longitude);
 
 guint champlain_map_source_get_y (ChamplainMapSource *map_source,
-    gint zoom_level, gdouble latitude);
+    gint zoom_level,
+    gdouble latitude);
 
 gdouble champlain_map_source_get_longitude (ChamplainMapSource *map_source,
-    gint zoom_level, guint x);
+    gint zoom_level,
+    guint x);
 
 gdouble champlain_map_source_get_latitude (ChamplainMapSource *map_source,
-    gint zoom_level, guint y);
+    gint zoom_level,
+    guint y);
 
 guint champlain_map_source_get_row_count (ChamplainMapSource *map_source,
     gint zoom_level);
@@ -88,7 +92,9 @@ guint champlain_map_source_get_column_count (ChamplainMapSource *map_source,
     gint zoom_level);
 
 void champlain_map_source_get_tile (ChamplainMapSource *map_source,
-    ChamplainView *view, ChamplainZoomLevel *level, ChamplainTile *tile);
+    ChamplainView *view,
+    ChamplainZoomLevel *level,
+    ChamplainTile *tile);
 
 void champlain_map_source_set_name (ChamplainMapSource *map_source,
     const gchar *name);
@@ -98,5 +104,4 @@ void champlain_map_source_set_license (ChamplainMapSource *map_source,
     const gchar *license);
 const gchar * champlain_map_source_get_license (ChamplainMapSource *map_source);
 
-
 #endif

diff --git a/champlain/champlain-network-map-source.c b/champlain/champlain-network-map-source.c
index 877454c9b203dc58442b0ca42e660c434b36dac0..aad8f7dcff834f92ae791218a4fe224d16ed60f0 100644 (file)
--- a/champlain/champlain-network-map-source.c
+++ b/champlain/champlain-network-map-source.c
@@ -73,9 +73,9 @@ struct _ChamplainNetworkMapSourcePrivate
 
 static void
 champlain_network_map_source_get_property (GObject *object,
-                                           guint prop_id,
-                                           GValue *value,
-                                           GParamSpec *pspec)
+    guint prop_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainNetworkMapSource *network_map_source = CHAMPLAIN_NETWORK_MAP_SOURCE(object);
   ChamplainNetworkMapSourcePrivate *priv = network_map_source->priv;
@@ -98,9 +98,9 @@ champlain_network_map_source_get_property (GObject *object,
 
 static void
 champlain_network_map_source_set_property (GObject *object,
-                                           guint prop_id,
-                                           const GValue *value,
-                                           GParamSpec *pspec)
+    guint prop_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainNetworkMapSource *network_map_source = CHAMPLAIN_NETWORK_MAP_SOURCE(object);
   ChamplainNetworkMapSourcePrivate *priv = network_map_source->priv;
@@ -132,7 +132,7 @@ champlain_network_map_source_finalize (GObject *object)
 {
   ChamplainNetworkMapSource *network_map_source = CHAMPLAIN_NETWORK_MAP_SOURCE (object);
   ChamplainNetworkMapSourcePrivate *priv = network_map_source->priv;
-  
+
   g_free (priv->proxy_uri);
   g_free (priv->uri_format);
 
@@ -209,13 +209,13 @@ champlain_network_map_source_init (ChamplainNetworkMapSource *champlainMapSource
 
 ChamplainNetworkMapSource*
 champlain_network_map_source_new_full (const gchar *name,
-                                       const gchar *license,
-                                       const gchar *license_uri,
-                                       guint min_zoom,
-                                       guint max_zoom,
-                                       guint tile_size,
-                                       ChamplainMapProjection projection,
-                                       const gchar *uri_format)
+    const gchar *license,
+    const gchar *license_uri,
+    guint min_zoom,
+    guint max_zoom,
+    guint tile_size,
+    ChamplainMapProjection projection,
+    const gchar *uri_format)
 {
   ChamplainNetworkMapSource * network_map_source;
   network_map_source = g_object_new (CHAMPLAIN_TYPE_NETWORK_MAP_SOURCE, "name", name,
@@ -229,9 +229,9 @@ champlain_network_map_source_new_full (const gchar *name,
 #define SIZE 8
 gchar *
 champlain_network_map_source_get_tile_uri (ChamplainNetworkMapSource *network_map_source,
-                                           gint x,
-                                           gint y,
-                                           gint z)
+    gint x,
+    gint y,
+    gint z)
 {
   ChamplainNetworkMapSourcePrivate *priv = network_map_source->priv;
 
@@ -275,7 +275,7 @@ champlain_network_map_source_get_tile_uri (ChamplainNetworkMapSource *network_ma
 
 void
 champlain_network_map_source_set_tile_uri (ChamplainNetworkMapSource *network_map_source,
-                                           const gchar *uri_format)
+    const gchar *uri_format)
 {
   ChamplainNetworkMapSourcePrivate *priv = network_map_source->priv;
 
@@ -335,8 +335,8 @@ champlain_map_source_new_mff_relief (void)
 
 static gchar *
 get_filename (ChamplainNetworkMapSource *network_map_source,
-              ChamplainZoomLevel *level,
-              ChamplainTile *tile)
+    ChamplainZoomLevel *level,
+    ChamplainTile *tile)
 {
   //ChamplainNetworkMapSourcePrivate *priv = network_map_source->priv;
   return g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s" G_DIR_SEPARATOR_S
@@ -376,8 +376,8 @@ create_error_tile (ChamplainTile* tile)
 
 static void
 file_loaded_cb (SoupSession *session,
-                SoupMessage *msg,
-                gpointer user_data)
+    SoupMessage *msg,
+    gpointer user_data)
 {
   FileLoadedCallbackContext *ctx = (FileLoadedCallbackContext*) user_data;
   GdkPixbufLoader* loader;
@@ -484,9 +484,9 @@ finish:
 
 void
 champlain_network_map_source_get_tile (ChamplainMapSource *map_source,
-                               ChamplainView *view,
-                               ChamplainZoomLevel *zoom_level,
-                               ChamplainTile *tile)
+    ChamplainView *view,
+    ChamplainZoomLevel *zoom_level,
+    ChamplainTile *tile)
 {
   gchar* filename;
   gboolean use_cache = FALSE;

diff --git a/champlain/champlain-network-map-source.h b/champlain/champlain-network-map-source.h
index 1ec03033ba6326df4d3476fbed2b4bc446c76507..a796eac3e3f0333eef44ad70ada24dd56974cb66 100644 (file)
--- a/champlain/champlain-network-map-source.h
+++ b/champlain/champlain-network-map-source.h
@@ -64,13 +64,17 @@ ChamplainMapSource * champlain_map_source_new_oam (void);
 ChamplainMapSource * champlain_map_source_new_mff_relief (void);
 
 gchar * champlain_network_map_source_get_tile_uri (ChamplainNetworkMapSource *source,
-    gint x, gint y, gint z);
+    gint x,
+    gint y,
+    gint z);
 
 void champlain_network_map_source_set_tile_uri (ChamplainNetworkMapSource *network_map_source,
     const gchar *uri_format);
 
 void champlain_network_map_source_get_tile (ChamplainMapSource *map_source,
-    ChamplainView *view, ChamplainZoomLevel *level, ChamplainTile *tile);
+    ChamplainView *view,
+    ChamplainZoomLevel *level,
+    ChamplainTile *tile);
 
 
 #endif

diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index cc8ffe828303c4b789e312f4797d437a6ab046e0..5726aa0c8ed0f875136eb7b7a49bee8757ee5cd9 100644 (file)
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -234,8 +234,8 @@ viewport_get_current_latitude (ChamplainViewPrivate *priv)
 
 static gboolean
 scroll_event (ClutterActor *actor,
-              ClutterScrollEvent *event,
-              ChamplainView *view)
+    ClutterScrollEvent *event,
+    ChamplainView *view)
 {
   ChamplainViewPrivate *priv = view->priv;
 
@@ -304,7 +304,7 @@ scroll_event (ClutterActor *actor,
 
 static void
 marker_reposition_cb (ChamplainMarker *marker,
-                      ChamplainView *view)
+    ChamplainView *view)
 {
   ChamplainViewPrivate *priv = view->priv;
   ChamplainMarkerPrivate *marker_priv = CHAMPLAIN_MARKER_GET_PRIVATE (marker);
@@ -324,16 +324,16 @@ marker_reposition_cb (ChamplainMarker *marker,
 
 static void
 notify_marker_reposition_cb (ChamplainMarker *marker,
-                             GParamSpec *arg1,
-                             ChamplainView *view)
+    GParamSpec *arg1,
+    ChamplainView *view)
 {
   marker_reposition_cb (marker, view);
 }
 
 static void
 layer_add_marker_cb (ClutterGroup *layer,
-                     ChamplainMarker *marker,
-                     ChamplainView *view)
+    ChamplainMarker *marker,
+    ChamplainView *view)
 {
   g_signal_connect (marker, "notify::longitude",
       G_CALLBACK (notify_marker_reposition_cb), view);
@@ -343,7 +343,7 @@ layer_add_marker_cb (ClutterGroup *layer,
 
 static void
 connect_marker_notify_cb (ChamplainMarker *marker,
-                          ChamplainView *view)
+    ChamplainView *view)
 {
   g_signal_connect (marker, "notify::longitude",
       G_CALLBACK (notify_marker_reposition_cb), view);
@@ -351,7 +351,7 @@ connect_marker_notify_cb (ChamplainMarker *marker,
 
 static void
 layer_reposition_cb (ClutterActor *layer,
-                     ChamplainView *view)
+    ChamplainView *view)
 {
   clutter_container_foreach (CLUTTER_CONTAINER (layer),
       CLUTTER_CALLBACK (marker_reposition_cb), view);
@@ -459,9 +459,9 @@ resize_viewport (ChamplainView *view)
 
 static void
 champlain_view_get_property (GObject *object,
-                             guint prop_id,
-                             GValue *value,
-                             GParamSpec *pspec)
+    guint prop_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainView *view = CHAMPLAIN_VIEW (object);
   ChamplainViewPrivate *priv = view->priv;
@@ -515,9 +515,9 @@ champlain_view_get_property (GObject *object,
 
 static void
 champlain_view_set_property (GObject *object,
-                             guint prop_id,
-                             const GValue *value,
-                             GParamSpec *pspec)
+    guint prop_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainView *view = CHAMPLAIN_VIEW (object);
   ChamplainViewPrivate *priv = view->priv;
@@ -845,7 +845,7 @@ champlain_view_init (ChamplainView *view)
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->viewport),
       priv->user_layers);
   clutter_actor_raise (priv->user_layers, priv->map_layer);
-  
+
   champlain_view_set_size(view, priv->viewport_size.width,
       priv->viewport_size.height);
 
@@ -855,8 +855,8 @@ champlain_view_init (ChamplainView *view)
 
 static void
 viewport_x_changed_cb (GObject *gobject,
-                       GParamSpec *arg1,
-                       ChamplainView *view)
+    GParamSpec *arg1,
+    ChamplainView *view)
 {
   ChamplainViewPrivate *priv = view->priv;
 
@@ -907,8 +907,8 @@ viewport_x_changed_cb (GObject *gobject,
 //FIXME: move to an handler of actor size change
 void
 champlain_view_set_size (ChamplainView *view,
-                         guint width,
-                         guint height)
+    guint width,
+    guint height)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -951,8 +951,8 @@ update_license (ChamplainView *view)
 
 static gboolean
 finger_scroll_button_press_cb (ClutterActor *actor,
-                               ClutterButtonEvent *event,
-                               ChamplainView *view)
+    ClutterButtonEvent *event,
+    ChamplainView *view)
 {
   ChamplainViewPrivate *priv = view->priv;
 
@@ -1029,7 +1029,9 @@ champlain_view_new (void)
 }
 
 static void
-view_update_anchor (ChamplainView *view, gint x, gint y)
+view_update_anchor (ChamplainView *view,
+    gint x,
+    gint y)
 {
   ChamplainViewPrivate *priv = view->priv;
   gboolean need_anchor = FALSE;
@@ -1087,8 +1089,8 @@ view_update_anchor (ChamplainView *view, gint x, gint y)
  */
 void
 champlain_view_center_on (ChamplainView *view,
-                          gdouble latitude,
-                          gdouble longitude)
+    gdouble latitude,
+    gdouble longitude)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1124,8 +1126,8 @@ champlain_view_center_on (ChamplainView *view,
 
 static void
 timeline_new_frame (ClutterTimeline *timeline,
-                    gint frame_num,
-                    GoToContext *ctx)
+    gint frame_num,
+    GoToContext *ctx)
 {
   gdouble alpha;
   gdouble lat;
@@ -1190,8 +1192,8 @@ champlain_view_stop_go_to (ChamplainView *view)
  */
 void
 champlain_view_go_to (ChamplainView *view,
-                      gdouble latitude,
-                      gdouble longitude)
+    gdouble latitude,
+    gdouble longitude)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1313,7 +1315,8 @@ champlain_view_set_zoom_level (ChamplainView *view, gint zoom_level)
  * Since: 0.4
  */
 void
-champlain_view_set_min_zoom_level (ChamplainView *view, gint min_zoom_level)
+champlain_view_set_min_zoom_level (ChamplainView *view,
+    gint min_zoom_level)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1340,7 +1343,8 @@ champlain_view_set_min_zoom_level (ChamplainView *view, gint min_zoom_level)
  * Since: 0.4
  */
 void
-champlain_view_set_max_zoom_level (ChamplainView *view, gint max_zoom_level)
+champlain_view_set_max_zoom_level (ChamplainView *view,
+    gint max_zoom_level)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1367,7 +1371,8 @@ champlain_view_set_max_zoom_level (ChamplainView *view, gint max_zoom_level)
  * Since: 0.2
  */
 void
-champlain_view_add_layer (ChamplainView *view, ChamplainLayer *layer)
+champlain_view_add_layer (ChamplainView *view,
+    ChamplainLayer *layer)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
   g_return_if_fail (CLUTTER_IS_ACTOR (layer));
@@ -1400,9 +1405,9 @@ champlain_view_add_layer (ChamplainView *view, ChamplainLayer *layer)
  */
 gboolean
 champlain_view_get_coords_from_event (ChamplainView *view,
-                                      ClutterEvent *event,
-                                      gdouble *latitude,
-                                      gdouble *longitude)
+    ClutterEvent *event,
+    gdouble *latitude,
+    gdouble *longitude)
 {
   g_return_val_if_fail (CHAMPLAIN_IS_VIEW (view), FALSE);
   /* Apparently there isn a more precise test */
@@ -1478,7 +1483,8 @@ view_load_visible_tiles (ChamplainView *view)
 }
 
 static void
-view_position_tile (ChamplainView* view, ChamplainTile* tile)
+view_position_tile (ChamplainView* view,
+    ChamplainTile* tile)
 {
   ChamplainViewPrivate *priv = view->priv;
 
@@ -1513,9 +1519,9 @@ view_tiles_reposition (ChamplainView* view)
 
 void
 champlain_view_tile_ready (ChamplainView *view,
-                           ChamplainZoomLevel *level,
-                           ChamplainTile *tile,
-                           gboolean animate)
+    ChamplainZoomLevel *level,
+    ChamplainTile *tile,
+    gboolean animate)
 {
   ClutterActor *actor;
   ClutterEffectTemplate *etemplate;
@@ -1568,7 +1574,7 @@ view_update_state (ChamplainView *view)
  */
 void
 champlain_view_set_map_source (ChamplainView *view,
-                               ChamplainMapSource *source)
+    ChamplainMapSource *source)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view) &&
       CHAMPLAIN_IS_MAP_SOURCE (source));
@@ -1582,7 +1588,7 @@ champlain_view_set_map_source (ChamplainView *view,
 
   g_object_unref (priv->map_source);
   priv->map_source = g_object_ref (source);
-  
+
   priv->min_zoom_level = champlain_map_source_get_min_zoom_level (priv->map_source);
   priv->max_zoom_level = champlain_map_source_get_max_zoom_level (priv->map_source);
 
@@ -1633,7 +1639,7 @@ champlain_view_set_map_source (ChamplainView *view,
 */
 void
 champlain_view_set_decel_rate (ChamplainView *view,
-                               gdouble rate)
+    gdouble rate)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view) &&
       rate > 2.0 &&
@@ -1655,7 +1661,7 @@ champlain_view_set_decel_rate (ChamplainView *view,
 */
 void
 champlain_view_set_scroll_mode (ChamplainView *view,
-                                ChamplainScrollMode mode)
+    ChamplainScrollMode mode)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1678,7 +1684,7 @@ champlain_view_set_scroll_mode (ChamplainView *view,
 */
 void
 champlain_view_set_keep_center_on_resize (ChamplainView *view,
-                                          gboolean value)
+    gboolean value)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1700,7 +1706,7 @@ champlain_view_set_keep_center_on_resize (ChamplainView *view,
 */
 void
 champlain_view_set_show_license (ChamplainView *view,
-                                 gboolean value)
+    gboolean value)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1721,7 +1727,7 @@ champlain_view_set_show_license (ChamplainView *view,
 */
 void
 champlain_view_set_zoom_on_double_click (ChamplainView *view,
-                                         gboolean value)
+    gboolean value)
 {
   g_return_if_fail (CHAMPLAIN_IS_VIEW (view));
 
@@ -1745,18 +1751,18 @@ champlain_view_set_zoom_on_double_click (ChamplainView *view,
  */
 void
 champlain_view_ensure_visible (ChamplainView *view,
-                               gdouble lat1,
-                               gdouble lon1,
-                               gdouble lat2,
-                               gdouble lon2,
-                               gboolean animate)
+    gdouble lat1,
+    gdouble lon1,
+    gdouble lat2,
+    gdouble lon2,
+    gboolean animate)
 {
   ChamplainViewPrivate *priv = view->priv;
   gint zoom_level = priv->zoom_level;
   gdouble width, height;
   gdouble min_lat,min_lon,max_lat,max_lon;
   gboolean good_size = FALSE;
-  
+
   /*We first sort the lat,lon in order to have min and max */
   if (lat1 < lat2)
     {
@@ -1768,7 +1774,7 @@ champlain_view_ensure_visible (ChamplainView *view,
       max_lat = lat1;
       min_lat = lat2;
     }
-    
+
   if (lon1 < lon2)
     {
       min_lon = lon1;
@@ -1834,8 +1840,8 @@ champlain_view_ensure_visible (ChamplainView *view,
  */
 void
 champlain_view_ensure_markers_visible (ChamplainView *view,
-                                       ChamplainMarker *markers[],
-                                       gboolean animate)
+    ChamplainMarker *markers[],
+    gboolean animate)
 {
   gdouble min_lat, min_lon, max_lat, max_lon;
   ChamplainMarker *marker = NULL;

diff --git a/champlain/champlain-view.h b/champlain/champlain-view.h
index 3df2fabfa1a69810dcfb26ed5b124b3aa2556390..d21de1c036f8449620c14c6c989aa0eca4a42b5f 100644 (file)
--- a/champlain/champlain-view.h
+++ b/champlain/champlain-view.h
@@ -70,28 +70,40 @@ GType champlain_view_get_type (void);
 
 ClutterActor *champlain_view_new (void);
 
-void champlain_view_center_on (ChamplainView *view, gdouble latitude, gdouble longitude);
-void champlain_view_go_to (ChamplainView *view, gdouble latitude, gdouble longitude);
+void champlain_view_center_on (ChamplainView *view,
+    gdouble latitude,
+    gdouble longitude);
+void champlain_view_go_to (ChamplainView *view,
+    gdouble latitude,
+    gdouble longitude);
 void champlain_view_stop_go_to (ChamplainView *view);
 
 void champlain_view_zoom_in (ChamplainView *champlainView);
 void champlain_view_zoom_out (ChamplainView *champlainView);
 void champlain_view_set_zoom_level (ChamplainView *champlainView,
     gint zoom_level);
-void champlain_view_set_min_zoom_level (ChamplainView *view, 
+void champlain_view_set_min_zoom_level (ChamplainView *view,
     gint zoom_level);
-void champlain_view_set_max_zoom_level (ChamplainView *view, 
+void champlain_view_set_max_zoom_level (ChamplainView *view,
     gint zoom_level);
 
-void champlain_view_ensure_visible (ChamplainView *view, gdouble lat1,
-    gdouble lon1, gdouble lat2, gdouble lon2, gboolean animate);
+void champlain_view_ensure_visible (ChamplainView *view,
+    gdouble lat1,
+    gdouble lon1,
+    gdouble lat2,
+    gdouble lon2,
+    gboolean animate);
 void champlain_view_ensure_markers_visible (ChamplainView *view,
-    ChamplainMarker *markers[], gboolean animate);
+    ChamplainMarker *markers[],
+    gboolean animate);
 
 void champlain_view_set_map_source (ChamplainView *champlainView,
     ChamplainMapSource *map_source);
-void champlain_view_set_size (ChamplainView *view, guint width, guint height);
-void champlain_view_set_decel_rate (ChamplainView *view, gdouble rate);
+void champlain_view_set_size (ChamplainView *view,
+    guint width,
+    guint height);
+void champlain_view_set_decel_rate (ChamplainView *view,
+    gdouble rate);
 void champlain_view_set_scroll_mode (ChamplainView *view,
     ChamplainScrollMode mode);
 void champlain_view_set_keep_center_on_resize (ChamplainView *view,
@@ -100,10 +112,17 @@ void champlain_view_set_show_license (ChamplainView *view, gboolean value);
 void champlain_view_set_zoom_on_double_click (ChamplainView *view,
     gboolean value);
 
-void champlain_view_add_layer (ChamplainView *champlainView, ChamplainLayer *layer);
+void champlain_view_add_layer (ChamplainView *champlainView,
+    ChamplainLayer *layer);
 
-gboolean champlain_view_get_coords_from_event (ChamplainView *view, ClutterEvent *event, gdouble *lat, gdouble *lon);
+gboolean champlain_view_get_coords_from_event (ChamplainView *view,
+    ClutterEvent *event,
+    gdouble *lat,
+    gdouble *lon);
 
-void champlain_view_tile_ready (ChamplainView *view, ChamplainZoomLevel *level, ChamplainTile *tile, gboolean animate);
+void champlain_view_tile_ready (ChamplainView *view,
+    ChamplainZoomLevel *level,
+    ChamplainTile *tile,
+    gboolean animate);
 
 #endif