From d4052c9bd3a0b2da88c546eefe096f610a34edef Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 6 Dec 2013 07:55:30 +0000
Subject: [PATCH] cleanup

---
 NEWS.html             |  7 +------
 src/glade/ptask.glade | 41 +++++++++++++++++++++--------------------
 src/main.c            | 15 ---------------
 src/ui_tasktree.c     | 12 ++++++++++++
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/NEWS.html b/NEWS.html
index 9c43b0a..e5e5cac 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -323,11 +323,6 @@ asciidoc.install();
 <div class="ulist"><ul>
 <li>
 <p>
-focus to first item when selecting a project.
-</p>
-</li>
-<li>
-<p>
 keep focus on project after refresh.
 </p>
 </li>
@@ -501,7 +496,7 @@ Initial release.
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-12-04 23:13:52 CET
+Last updated 2013-12-04 23:16:56 CET
 </div>
 </div>
 </body>
diff --git a/src/glade/ptask.glade b/src/glade/ptask.glade
index 4efa9b4..00f4b37 100644
--- a/src/glade/ptask.glade
+++ b/src/glade/ptask.glade
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkListStore" id="prioritystore">
+    <columns>
+      <!-- column-name priority -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Low</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Medium</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">High</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="diag_tasknew">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -180,26 +200,6 @@
       <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="prioritystore">
-    <columns>
-      <!-- column-name priority -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">None</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Low</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Medium</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">High</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkListStore" id="projectstore">
     <columns>
       <!-- column-name gchararray1 -->
@@ -485,6 +485,7 @@
                         <property name="search_column">1</property>
                         <property name="enable_grid_lines">both</property>
                         <property name="enable_tree_lines">True</property>
+                        <signal name="cursor-changed" handler="tasktree_cursor_changed_cbk" swapped="no"/>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection3"/>
                         </child>
diff --git a/src/main.c b/src/main.c
index 4192965..0ea437d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -137,17 +137,6 @@ void refresh()
 	log_fct_exit();
 }
 
-static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
-{
-	log_fct_enter();
-
-	ui_taskpanel_update(ui_tasktree_get_selected_task());
-
-	log_fct_exit();
-
-	return FALSE;
-}
-
 static void log_init()
 {
 	char *home, *path, *dir;
@@ -232,10 +221,6 @@ int main(int argc, char **argv)
 
 	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();
diff --git a/src/ui_tasktree.c b/src/ui_tasktree.c
index 3a96622..abec583 100644
--- a/src/ui_tasktree.c
+++ b/src/ui_tasktree.c
@@ -22,6 +22,7 @@
 
 #include <log.h>
 #include <ui_projecttree.h>
+#include <ui_taskpanel.h>
 #include <ui_tasktree.h>
 
 static GtkTreeView *w_treeview;
@@ -75,6 +76,17 @@ static gint priority_cmp(GtkTreeModel *model,
 		return 0;
 }
 
+int tasktree_cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
+{
+	log_fct_enter();
+
+	ui_taskpanel_update(ui_tasktree_get_selected_task());
+
+	log_fct_exit();
+
+	return FALSE;
+}
+
 void ui_tasktree_init(GtkBuilder *builder)
 {
 	GtkTreeModel *model;
-- 
2.7.4