[geany/geany-plugins] b98b3d: debugger: Don't return aggregate values

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 08 Jun 2012 16:37:19
Commit:      b98b3db2a22b52449a3ed9c36e7367f977e8151f
             https://github.com/geany/geany-plugins/commit/b98b3db2a22b52449a3ed9c36e7367f977e8151f

Log Message:
-----------
debugger: Don't return aggregate values


Modified Paths:
--------------
    debugger/src/debug.c
    debugger/src/wtree.c
    debugger/src/wtree.h

Modified: debugger/src/debug.c
9 files changed, 6 insertions(+), 3 deletions(-)
===================================================================
@@ -347,7 +347,9 @@ static void on_watch_dragged_callback(GtkWidget *wgt, GdkDragContext *context, i
 	}
 	else
 	{
-		GtkTreeIter empty = wtree_empty_row();
+		GtkTreeIter empty;
+
+		wtree_empty_row(&empty);
 		gtk_tree_store_insert_before(wstore, &newvar, NULL, &empty);
 	}
 	
@@ -522,8 +524,9 @@ static gboolean on_watch_button_pressed_callback(GtkWidget *treeview, GdkEventBu
 
 			if (strlen(expression))
 			{
-				GtkTreeIter newvar;
-				GtkTreeIter empty = wtree_empty_row();
+				GtkTreeIter newvar, empty;
+
+				wtree_empty_row(&empty);
 				gtk_tree_store_insert_before(wstore, &newvar, NULL, &empty);
 			
 				/* if debugger is active (in stopped condition) - add to run-time watch list


Modified: debugger/src/wtree.c
12 files changed, 5 insertions(+), 7 deletions(-)
===================================================================
@@ -99,17 +99,14 @@ static void on_render_name(GtkTreeViewColumn *tree_column,
 /*
  * get iterator to an empty row
  */
-GtkTreeIter wtree_empty_row(void)
+void wtree_empty_row(GtkTreeIter *iter)
 {
-	GtkTreeIter empty;
 	GtkTreePath *path = gtk_tree_row_reference_get_path(empty_row);
 
 	gtk_tree_model_get_iter(gtk_tree_view_get_model(GTK_TREE_VIEW(tree)),
-		&empty,
+		iter,
 		path);
 	gtk_tree_path_free(path);
-	
-	return empty;
 }
 
 /*
@@ -206,8 +203,9 @@ void wtree_remove_all(void)
  */
 void wtree_add_watch(gchar *watch)
 {
-	GtkTreeIter newvar;
-	GtkTreeIter empty = wtree_empty_row();
+	GtkTreeIter newvar, empty;
+
+	wtree_empty_row(&empty);
 	gtk_tree_store_insert_before(store, &newvar, NULL, &empty);
 
 	variable_set_name_only(store, &newvar, watch);


Modified: debugger/src/wtree.h
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -32,7 +32,7 @@ GtkWidget*		wtree_init(watch_expanded_callback expanded,
 	watch_key_pressed keypressed,
 	watch_expression_changed changed,
 	watch_button_pressed buttonpressed);
-GtkTreeIter		wtree_empty_row(void);
+void			wtree_empty_row(GtkTreeIter *iter);
 GtkTreePath*	wtree_empty_path(void);
 GList*			wtree_get_watches(void);
 void			wtree_remove_all(void);


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).