Remove dependencies to gob2

[andy/viking.git] / src / vikaggregatelayer.c

diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c
index 1487ab61f69ec6e3720490466369401b2730cf43..884340f787ca5dc20fd362e58092869817e05346 100644 (file)
--- a/src/vikaggregatelayer.c
+++ b/src/vikaggregatelayer.c
@@ -20,7 +20,7 @@
  */
 
 #include "viking.h"
-#include "vikaggregatelayer_pixmap.h"
+#include "icons/icons.h"
 
 #include <string.h>
 
@@ -33,7 +33,7 @@ static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikA
 
 VikLayerInterface vik_aggregate_layer_interface = {
   "Aggregate",
-  &aggregatelayer_pixbuf,
+  &vikaggregatelayer_pixbuf,
 
   NULL,
   0,
@@ -289,7 +289,7 @@ void vik_aggregate_layer_draw ( VikAggregateLayer *val, gpointer data )
         vik_viewport_snapshot_save( VIK_VIEWPORT(data) );
       }
     }
-    if ( vl->type == VIK_LAYER_AGGREGATE || ! vik_viewport_get_half_drawn( VIK_VIEWPORT(data) ) )
+    if ( vl->type == VIK_LAYER_AGGREGATE || vl->type == VIK_LAYER_GPS || ! vik_viewport_get_half_drawn( VIK_VIEWPORT(data) ) )
       vik_layer_draw ( vl, data );
     iter = iter->next;
   }