Whitespace cleanups

6 files changed, 31 insertions, 24 deletions

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index c313f67..238a237 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -94,7 +94,7 @@ libchamplain_sources =					\
 	champlain-kinetic-scroll-view.c \
 	champlain-viewport.c	\
 	champlain-bounding-box.c		\
-	$(srcdir)/champlain-exportable.c
+	champlain-exportable.c
 
 champlain-features.h: $(top_builddir)/config.status
 	$(AM_V_GEN) ( cd $(top_builddir) && ./config.status champlain/$@ )
diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c
index 2dea139..3694e0c 100644
--- a/champlain/champlain-image-renderer.c
+++ b/champlain/champlain-image-renderer.c
@@ -152,6 +152,7 @@ image_tile_draw_cb (ClutterCanvas   *canvas,
   return FALSE;
 }
 
+
 static void
 image_rendered_cb (GInputStream *stream, GAsyncResult *res, RendererData *data)
 {
@@ -224,7 +225,6 @@ finish:
 }
 
 
-
 static void
 render (ChamplainRenderer *renderer, ChamplainTile *tile)
 {
diff --git a/champlain/champlain-path-layer.c b/champlain/champlain-path-layer.c
index a4e9847..0669929 100644
--- a/champlain/champlain-path-layer.c
+++ b/champlain/champlain-path-layer.c
@@ -411,6 +411,7 @@ champlain_path_layer_init (ChamplainPathLayer *self)
   clutter_actor_add_child (CLUTTER_ACTOR (self), priv->path_actor);
 }
 
+
 static void
 set_surface (ChamplainExportable *exportable,
      cairo_surface_t *surface)
@@ -428,6 +429,7 @@ set_surface (ChamplainExportable *exportable,
   g_object_notify (G_OBJECT (self), "surface");
 }
 
+
 static cairo_surface_t *
 get_surface (ChamplainExportable *exportable)
 {
diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
index 4c2e6d1..9ce9fd5 100644
--- a/champlain/champlain-tile.c
+++ b/champlain/champlain-tile.c
@@ -366,7 +366,7 @@ champlain_tile_class_init (ChamplainTileClass *klass)
           FALSE,
           G_PARAM_READWRITE));
 
-    g_object_class_override_property (object_class,
+  g_object_class_override_property (object_class,
       PROP_SURFACE,
       "surface");
 
@@ -451,6 +451,7 @@ exportable_interface_init (ChamplainExportableIface *iface)
   iface->set_surface = set_surface;
 }
 
+
 /**
  * champlain_tile_new:
  *
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 537cda0..4e5480c 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -1746,7 +1746,6 @@ champlain_view_zoom_out (ChamplainView *view)
 }
 
 
-
 static void
 layers_to_surface (ChamplainView *view,
     cairo_t *cr)
@@ -1769,6 +1768,7 @@ layers_to_surface (ChamplainView *view,
     }
 }
 
+
 /**
  * champlain_view_to_surface:
  * @view: a #ChamplainView
@@ -1825,9 +1825,9 @@ champlain_view_to_surface (ChamplainView *view,
           tile_surface = champlain_exportable_get_surface (CHAMPLAIN_EXPORTABLE (tile));
           if (!tile_surface)
             {
-          cairo_destroy (cr);
-                cairo_surface_destroy (surface);
-                return NULL;
+              cairo_destroy (cr);
+              cairo_surface_destroy (surface);
+              return NULL;
             }
           x = ((double) tile_x * tile_size) - priv->viewport_x;
           y = ((double) tile_y * tile_size) - priv->viewport_y;
diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
index 12a06c0..dba8dee 100644
--- a/demos/launcher-gtk.c
+++ b/demos/launcher-gtk.c
@@ -51,7 +51,6 @@ toggle_layer (GtkToggleButton *widget,
     {
       champlain_path_layer_set_visible (path_layer, TRUE);
       champlain_path_layer_set_visible (path, TRUE);
-
       champlain_marker_layer_animate_in_all_markers (CHAMPLAIN_MARKER_LAYER (layer));
     }
   else
@@ -211,6 +210,7 @@ append_point (ChamplainPathLayer *layer, gdouble lon, gdouble lat)
   champlain_path_layer_add_node (layer, CHAMPLAIN_LOCATION (coord));
 }
 
+
 static void
 export_to_png_cb (GdkPixbuf    *pixbuf,
     GAsyncResult *res)
@@ -218,6 +218,7 @@ export_to_png_cb (GdkPixbuf    *pixbuf,
   gdk_pixbuf_save_to_stream_finish (res, NULL);
 }
 
+
 static void
 export_png (GtkButton     *button,
     ChamplainView *view)
@@ -256,6 +257,7 @@ export_png (GtkButton     *button,
                                    NULL);
 }
 
+
 static void
 add_clicked (GtkButton     *button,
              ChamplainView *view)
@@ -284,31 +286,33 @@ add_clicked (GtkButton     *button,
 
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-  if (response == GTK_RESPONSE_OK) {
-    GtkTreeModel *model;
-    GtkTreeIter iter;
-    ChamplainMapSource *source;
-    ChamplainMapSourceFactory *factory;
-    char *id;
+  if (response == GTK_RESPONSE_OK)
+    {
+      GtkTreeModel *model;
+      GtkTreeIter iter;
+      ChamplainMapSource *source;
+      ChamplainMapSourceFactory *factory;
+      char *id;
 
-    if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
-      return;
+      if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
+        return;
 
-    model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+      model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
 
-    gtk_tree_model_get (model, &iter, COL_ID, &id, -1);
+      gtk_tree_model_get (model, &iter, COL_ID, &id, -1);
 
-    factory = champlain_map_source_factory_dup_default ();
-    source = champlain_map_source_factory_create_memcached_source (factory, id);
+      factory = champlain_map_source_factory_dup_default ();
+      source = champlain_map_source_factory_create_memcached_source (factory, id);
 
-    champlain_view_add_overlay_source (view, source, 0.6 * 255);
-    g_object_unref (factory);
-    g_free (id);
-  }
+      champlain_view_add_overlay_source (view, source, 0.6 * 255);
+      g_object_unref (factory);
+      g_free (id);
+    }
 
   gtk_widget_destroy (dialog);
 }
 
+
 int
 main (int argc,
     char *argv[])