From 43becf6e8c25af9159ca3a3f288e4a30e97c3c65 Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille Date: Sat, 23 Aug 2008 17:32:42 +0000 Subject: [PATCH] Acting (Cut, Copy, Paste) when nothing selected is not critical g_return_if_fail function produces critical message. --- ChangeLog | 4 ++++ src/viklayerspanel.c | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c527641..2a08f0fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-08-23 +Guilhem Bonnefille : + * Cut/Copy/Paste empty selection is not critical + 2008-06-23: Mathieu Albinet : * Layers panel UI improvements diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c index 1fa9e553..480cb5d0 100644 --- a/src/viklayerspanel.c +++ b/src/viklayerspanel.c @@ -509,7 +509,10 @@ void vik_layers_panel_cut_selected ( VikLayersPanel *vlp ) 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 ); @@ -538,7 +541,9 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *vlp ) 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 ); @@ -550,7 +555,9 @@ void vik_layers_panel_copy_selected ( VikLayersPanel *vlp ) 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 ); } @@ -559,7 +566,9 @@ void vik_layers_panel_delete_selected ( VikLayersPanel *vlp ) 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 ); -- 2.39.5