From c4dab9e55d7ed50fd30a61a07402414dcc388479 Mon Sep 17 00:00:00 2001 From: Bart Hakvoort Date: Sun, 22 Oct 2006 18:19:23 +0000 Subject: [PATCH] gtk+-2.10 seems to return the last valid iterator if get_iter is executed * src/Dialog_Progress.cc: gtk+-2.10 seems to return the last valid iterator if get_iter is executed with an invalid treepath. This is different from gtk+-2.8 and gave some problems in the operationdetails. I added a check to make it work in both situations. --- ChangeLog | 8 ++++++++ src/Dialog_Progress.cc | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f16d449..55cce500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-10-22 Bart Hakvoort + + * src/Dialog_Progress.cc: gtk+-2.10 seems to return the last valid + iterator if get_iter is executed with an invalid treepath. This is + different from gtk+-2.8 and gave some problems in the + operationdetails. I added a check to make it work in both + situations. + 2006-10-01 Bart Hakvoort * src/GParted_Core.cc: only add mountpoints and paths if they exist diff --git a/src/Dialog_Progress.cc b/src/Dialog_Progress.cc index 6e0ba33c..4db26e96 100644 --- a/src/Dialog_Progress.cc +++ b/src/Dialog_Progress.cc @@ -117,7 +117,8 @@ void Dialog_Progress::on_signal_update( const OperationDetail & operationdetail { Gtk::TreeModel::iterator iter = treestore_operations ->get_iter( operationdetail .get_treepath() ) ; - if ( iter ) + //i added the second check after get_iter() in gtk+-2.10 seems to behave differently from gtk+-2.8 + if ( iter && treestore_operations ->get_string( iter ) == operationdetail .get_treepath() ) { Gtk::TreeRow treerow = *iter ;