]> git.street.me.uk Git - andy/viking.git/commitdiff
Enable updating the treeview to allow setting a blank waypoint symbol.
authorRob Norris <rw_norris@hotmail.com>
Mon, 4 Mar 2013 19:43:25 +0000 (19:43 +0000)
committerRob Norris <rw_norris@hotmail.com>
Tue, 5 Mar 2013 23:58:18 +0000 (23:58 +0000)
src/viktreeview.c
src/viktrwlayer.c

index c12826ca34dbcf84f42803e5ba72d60911da4c10..ede41783acd057dbb4120454f5d2039ffecd2bd5 100644 (file)
@@ -508,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);
 }
 
index 9b791a105e23daf0f441f85ff94b1f294c30ead9..e8eae736d2f87b6024f61dce46c937bc575c7528 100644 (file)
@@ -4253,7 +4253,7 @@ static void trw_layer_properties_item ( gpointer pass_along[7] )
       gboolean updated = FALSE;
       a_dialog_waypoint ( VIK_GTK_WINDOW_FROM_LAYER(vtl), wp->name, wp, vtl->coord_mode, FALSE, &updated );
 
-      if ( updated && wp->symbol && pass_along[6] )
+      if ( updated && pass_along[6] )
         vik_treeview_item_set_icon ( VIK_LAYER(vtl)->vt, pass_along[6], get_wp_sym_small (wp->symbol) );
 
       if ( updated && VIK_LAYER(vtl)->visible )