X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/9c237137b2ffa3b22215fb21243910bb89c18eec..6de95419da92c374ae4851c780b05daecbafd86a:/src/viktreeview.c

diff --git a/src/viktreeview.c b/src/viktreeview.c
index cedc1cfe..ede41783 100644
--- a/src/viktreeview.c
+++ b/src/viktreeview.c
@@ -385,8 +385,6 @@ static gboolean vik_treeview_selection_filter(GtkTreeSelection *selection, GtkTr
 
 void vik_treeview_init ( VikTreeview *vt )
 {
-  guint16 i;
-
   vt->was_a_toggle = FALSE;
 
   vt->model = GTK_TREE_MODEL(gtk_tree_store_new ( NUM_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN ));
@@ -417,6 +415,7 @@ void vik_treeview_init ( VikTreeview *vt )
     idest->drag_data_received = vik_treeview_drag_data_received;
   }      
 
+  VikLayerTypeEnum i;
   for ( i = 0; i < VIK_LAYER_NUM_TYPES; i++ )
     vt->layer_type_icons[i] = vik_layer_load_icon ( i ); /* if icon can't be loaded, it will be null and simply not be shown. */
 
@@ -509,7 +508,7 @@ void vik_treeview_item_delete ( VikTreeview *vt, GtkTreeIter *iter )
 
 void vik_treeview_item_set_icon ( VikTreeview *vt, GtkTreeIter *iter, const GdkPixbuf *icon )
 {
-  g_return_if_fail ( iter != NULL && icon != NULL );
+  g_return_if_fail ( iter != NULL );
   gtk_tree_store_set ( GTK_TREE_STORE(vt->model), iter, ICON_COLUMN, icon, -1);
 }