Don't use the GET_PRIVATE macro when not necessary

3 files changed, 17 insertions, 17 deletions

diff --git a/champlain/champlain-marker-layer.c b/champlain/champlain-marker-layer.c
index 31b5c1b..c75bfa2 100644
--- a/champlain/champlain-marker-layer.c
+++ b/champlain/champlain-marker-layer.c
@@ -333,7 +333,7 @@ set_selected_all_but_one (ChamplainMarkerLayer *layer,
     ChamplainMarker *not_selected,
     gboolean select)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
 
@@ -438,7 +438,7 @@ void
 champlain_marker_layer_add_marker (ChamplainMarkerLayer *layer,
     ChamplainMarker *marker)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
 
   g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
   g_return_if_fail (CHAMPLAIN_IS_MARKER (marker));
@@ -470,7 +470,7 @@ champlain_marker_layer_add_marker (ChamplainMarkerLayer *layer,
 void
 champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
 
@@ -511,7 +511,7 @@ champlain_marker_layer_remove_all (ChamplainMarkerLayer *layer)
 GList *
 champlain_marker_layer_get_markers (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
 
   return clutter_container_get_children (CLUTTER_CONTAINER (priv->content_group));
 }
@@ -530,7 +530,7 @@ champlain_marker_layer_get_markers (ChamplainMarkerLayer *layer)
 GList *
 champlain_marker_layer_get_selected (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
   GList *selected = NULL;
@@ -566,7 +566,7 @@ void
 champlain_marker_layer_remove_marker (ChamplainMarkerLayer *layer,
     ChamplainMarker *marker)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
 
   g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
   g_return_if_fail (CHAMPLAIN_IS_MARKER (marker));
@@ -595,7 +595,7 @@ champlain_marker_layer_remove_marker (ChamplainMarkerLayer *layer,
 void
 champlain_marker_layer_animate_in_all_markers (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   guint delay = 0;
   GList *markers;
@@ -627,7 +627,7 @@ champlain_marker_layer_animate_in_all_markers (ChamplainMarkerLayer *layer)
 void
 champlain_marker_layer_animate_out_all_markers (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   guint delay = 0;
   GList *markers;
@@ -659,7 +659,7 @@ champlain_marker_layer_animate_out_all_markers (ChamplainMarkerLayer *layer)
 void
 champlain_marker_layer_show_all_markers (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
 
@@ -689,7 +689,7 @@ champlain_marker_layer_show_all_markers (ChamplainMarkerLayer *layer)
 void
 champlain_marker_layer_hide_all_markers (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
 
@@ -719,7 +719,7 @@ champlain_marker_layer_hide_all_markers (ChamplainMarkerLayer *layer)
 void
 champlain_marker_layer_set_all_markers_draggable (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
 
@@ -749,7 +749,7 @@ champlain_marker_layer_set_all_markers_draggable (ChamplainMarkerLayer *layer)
 void
 champlain_marker_layer_set_all_markers_undraggable (ChamplainMarkerLayer *layer)
 {
-  ChamplainMarkerLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainMarkerLayerPrivate *priv = layer->priv;
   GList *elem;
   GList *markers;
 
diff --git a/champlain/champlain-memphis-renderer.c b/champlain/champlain-memphis-renderer.c
index 3d5a4e9..1b7b61c 100644
--- a/champlain/champlain-memphis-renderer.c
+++ b/champlain/champlain-memphis-renderer.c
@@ -692,7 +692,7 @@ champlain_memphis_renderer_set_tile_size (ChamplainMemphisRenderer *renderer,
 {
   g_return_if_fail (CHAMPLAIN_IS_MEMPHIS_RENDERER (renderer));
 
-  ChamplainMemphisRendererPrivate *priv = GET_PRIVATE (renderer);
+  ChamplainMemphisRendererPrivate *priv = renderer->priv;
 
   renderer->priv->tile_size = size;
 
diff --git a/champlain/champlain-path-layer.c b/champlain/champlain-path-layer.c
index caf9518..d58870a 100644
--- a/champlain/champlain-path-layer.c
+++ b/champlain/champlain-path-layer.c
@@ -514,7 +514,7 @@ add_node (ChamplainPathLayer *layer,
     gboolean append,
     guint position)
 {
-  ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainPathLayerPrivate *priv = layer->priv;
 
   g_signal_connect (G_OBJECT (location), "notify::latitude",
       G_CALLBACK (position_notify), layer);
@@ -560,7 +560,7 @@ champlain_path_layer_add_node (ChamplainPathLayer *layer,
 void
 champlain_path_layer_remove_all (ChamplainPathLayer *layer)
 {
-  ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainPathLayerPrivate *priv = layer->priv;
   GList *elem;
 
   g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer));
@@ -595,7 +595,7 @@ champlain_path_layer_remove_all (ChamplainPathLayer *layer)
 GList *
 champlain_path_layer_get_nodes (ChamplainPathLayer *layer)
 {
-  ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainPathLayerPrivate *priv = layer->priv;
 
   return g_list_copy (priv->nodes);
 }
@@ -614,7 +614,7 @@ void
 champlain_path_layer_remove_node (ChamplainPathLayer *layer,
     ChamplainLocation *location)
 {
-  ChamplainPathLayerPrivate *priv = GET_PRIVATE (layer);
+  ChamplainPathLayerPrivate *priv = layer->priv;
 
   g_return_if_fail (CHAMPLAIN_IS_PATH_LAYER (layer));
   g_return_if_fail (CHAMPLAIN_IS_LOCATION (location));