Remove dependencies to gob2

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

diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c
index 8257f7704f3eac6504419bc1447f1e37c6104f25..50358913c56fcce79b680232c9e0239786b8f547 100644 (file)
--- a/src/viklayerspanel.c
+++ b/src/viklayerspanel.c
@@ -63,7 +63,7 @@ static GtkItemFactoryEntry base_entries[] = {
  { N_("/New Layer"), NULL, NULL, -1, "<Branch>" },
 };
 
  { N_("/New Layer"), NULL, NULL, -1, "<Branch>" },
 };
 

-#define NUM_BASE_ENTRIES 5
+#define NUM_BASE_ENTRIES (sizeof(base_entries)/sizeof(base_entries[0]))

 
 static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter);
 static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text);
 
 static void layers_item_toggled (VikLayersPanel *vlp, GtkTreeIter *iter);
 static void layers_item_edited (VikLayersPanel *vlp, GtkTreeIter *iter, const gchar *new_text);


@@ -485,7 +485,9 @@ gboolean vik_layers_panel_properties ( VikLayersPanel *vlp )
   {
     if ( vik_treeview_item_get_data ( vlp->vt, &iter ) == VIK_LAYER_AGGREGATE )
       a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("Aggregate Layers have no settable properties.") );
   {
     if ( vik_treeview_item_get_data ( vlp->vt, &iter ) == VIK_LAYER_AGGREGATE )
       a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_WIDGET(vlp), _("Aggregate Layers have no settable properties.") );

-    vik_layer_properties ( VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) ), vlp->vvp );
+    VikLayer *layer = VIK_LAYER( vik_treeview_item_get_pointer ( vlp->vt, &iter ) );
+    if (vik_layer_properties ( layer, vlp->vvp ))
+      vik_layer_emit_update ( layer );

     return TRUE;
   }
   else
     return TRUE;
   }
   else


@@ -509,7 +511,10 @@ void vik_layers_panel_cut_selected ( VikLayersPanel *vlp )
   gint type;
   GtkTreeIter iter;
   
   gint type;
   GtkTreeIter iter;
   

-  g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) );
+  g_debug(__FUNCTION__);
+  if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) )
+    /* Nothing to do */
+    return;

 
   type = vik_treeview_item_get_type ( vlp->vt, &iter );
 
 
   type = vik_treeview_item_get_type ( vlp->vt, &iter );
 


@@ -538,7 +543,9 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *vlp )
   gint type;
   GtkTreeIter iter;
   
   gint type;
   GtkTreeIter iter;
   

-  g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) );
+  if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) )
+    /* Nothing to do */
+    return;

 
   type = vik_treeview_item_get_type ( vlp->vt, &iter );
 
 
   type = vik_treeview_item_get_type ( vlp->vt, &iter );
 


@@ -550,7 +557,9 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *vlp )
 void vik_layers_panel_paste_selected ( VikLayersPanel *vlp )
 {
   GtkTreeIter iter;
 void vik_layers_panel_paste_selected ( VikLayersPanel *vlp )
 {
   GtkTreeIter iter;

-  g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) );
+  if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) )
+    /* Nothing to do */
+    return;

   a_clipboard_paste ( vlp );
 }
 
   a_clipboard_paste ( vlp );
 }
 


@@ -559,7 +568,9 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp )
   gint type;
   GtkTreeIter iter;
   
   gint type;
   GtkTreeIter iter;
   

-  g_return_if_fail ( vik_treeview_get_selected_iter ( vlp->vt, &iter ) );
+  if ( ! vik_treeview_get_selected_iter ( vlp->vt, &iter ) )
+    /* Nothing to do */
+    return;

 
   type = vik_treeview_item_get_type ( vlp->vt, &iter );
 
 
   type = vik_treeview_item_get_type ( vlp->vt, &iter );