[libchamplain/libchamplain-0-4] Fix coding style to match the rest

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit 6105b73d60b09ae29c27b7ae8fbaacbbba3df4f1
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Tue Dec 15 09:15:54 2009 -0500

    Fix coding style to match the rest

 champlain/champlain-view.c |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 409ea23..e89f59e 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -1018,24 +1018,24 @@ update_scale (gpointer *unused,
 
   */
 
-  if (! priv || !priv->map || !priv->map->current_level) {
+  if (! priv || !priv->map || !priv->map->current_level)
     return;
-  }
-  if (priv->display_scale) {
-    clutter_actor_show(priv->scale_actor);
-  } else {
-    clutter_actor_hide(priv->scale_actor);
-  }
+
+  if (priv->display_scale)
+    {
+      clutter_actor_show(priv->scale_actor);
+    }
+  else
+    {
+      clutter_actor_hide(priv->scale_actor);
+    }
 
   level = priv->map->current_level;
   tile = champlain_zoom_level_get_nth_tile(level, 0);
   m_per_pixel = 2 * M_PI * 6378100 * sin(M_PI/2 - M_PI / 180*priv->latitude) /
     (champlain_tile_get_size (tile) * champlain_zoom_level_get_width (level));
-  printf("FOO: %.2f\n", m_per_pixel);
-  printf("FOO: %d\n", champlain_zoom_level_get_height (level));
 
   label = g_strdup_printf("%.2f km", (m_per_pixel * SCALE_WIDTH) / 1000);
-  printf("FOO2: %s\n", label);
 
   text = clutter_container_find_child_by_name (CLUTTER_CONTAINER (priv->scale_actor), "scale-label");
   clutter_text_set_text (CLUTTER_TEXT (text), label);
@@ -1050,12 +1050,18 @@ create_scale (ChamplainView *view)
   ChamplainViewPrivate *priv = view->priv;
   priv->scale_actor = g_object_ref (clutter_group_new());
 
-  g_signal_connect (view, "notify::zoom-level", G_CALLBACK (update_scale),
-		    view);
-  g_signal_connect (priv->viewport, "notify::y-origin",
-		    G_CALLBACK (update_scale), view);
-  g_signal_connect (view, "notify::display-scale",
-		    G_CALLBACK (update_scale), view);
+  g_signal_connect (view,
+      "notify::zoom-level",
+      G_CALLBACK (update_scale),
+      view);
+  g_signal_connect (priv->viewport,
+      "notify::y-origin",
+      G_CALLBACK (update_scale),
+      view);
+  g_signal_connect (view,
+      "notify::display-scale",
+      G_CALLBACK (update_scale),
+      view);
 
   scale = clutter_cairo_texture_new (SCALE_WIDTH, SCALE_HEIGHT);
   cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (scale));