X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=b6442c9a1db02c70793667b5159ad94c5ca186c5;hb=ca33e1f8a9927a486abb79d6f41f411a1851e17b;hp=880bde48d38f6e990289e9cf5fa0dba9d511a597;hpb=71d1d4d6f67700c58fb51513ec0ae17924431073;p=ptask.git

diff --git a/src/main.c b/src/main.c
index 880bde4..b6442c9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,17 +38,8 @@
 
 static const char *program_name;
 static struct task **tasks;
-static GtkTreeView *w_treeview;
 static GSettings *settings;
 
-enum {
-	COL_ID,
-	COL_DESCRIPTION,
-	COL_PROJECT,
-	COL_UUID,
-	COL_PRIORITY
-};
-
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
@@ -95,17 +86,21 @@ static void print_help()
 void refresh()
 {
 	GtkWidget *dialog;
-	const char *current_prj;
+	const char *current_prj, *current_uuid;
+	struct task **old_tasks;
 
 	log_fct_enter();
 	ui_taskpanel_update(NULL);
 
 	if (tasks) {
+		old_tasks = tasks;
 		current_prj = ui_projecttree_get_project();
+		current_uuid = ui_tasktree_get_task_uuid();
 		ui_tasktree_update(NULL, NULL);
-		tw_task_list_free(tasks);
 	} else {
+		old_tasks = NULL;
 		current_prj = NULL;
+		current_uuid = NULL;
 	}
 
 	tasks = tw_get_all_tasks(ui_get_status_filter());
@@ -113,6 +108,8 @@ void refresh()
 	if (tasks) {
 		ui_projecttree_update(tasks);
 		ui_tasktree_update(tasks, current_prj);
+		if (current_uuid)
+			ui_tasktree_set_selected_task(current_uuid);
 	} else {
 		dialog = gtk_message_dialog_new(NULL,
 						GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -124,18 +121,11 @@ void refresh()
 		gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_destroy(dialog);
 	}
-	log_fct(__func__, "EXIT");
-}
 
-static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
-{
-	log_fct_enter();
-
-	ui_taskpanel_update(ui_tasktree_get_selected_task());
+	if (old_tasks)
+		tw_task_list_free(old_tasks);
 
 	log_fct_exit();
-
-	return FALSE;
 }
 
 static void log_init()
@@ -218,14 +208,8 @@ int main(int argc, char **argv)
 	ui_tasktree_init(builder);
 	ui_projecttree_init(builder);
 
-	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
-
 	gtk_builder_connect_signals(builder, NULL);
 
-	g_signal_connect(w_treeview,
-			 "cursor-changed", (GCallback)cursor_changed_cbk,
-			 tasks);
-
 	g_object_unref(G_OBJECT(builder));
 
 	refresh();