From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sat, 30 Nov 2013 21:12:52 +0000 (+0000)
Subject: refactoring
X-Git-Tag: v0.0.6~52
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=ptask.git;a=commitdiff_plain;h=59e486b34640f81c905e832c7cc4a1b8a9a8e6f4

refactoring
---

diff --git a/src/main.c b/src/main.c
index 2ddd679..6411492 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,7 +39,6 @@
 static const char *program_name;
 static struct task **tasks;
 static GtkTreeView *w_treeview;
-static GtkComboBox *w_status;
 static GSettings *settings;
 
 enum {
@@ -181,14 +180,6 @@ void refresh()
 	log_fct(__func__, "EXIT");
 }
 
-static int status_changed_cbk(GtkComboBox *w, gpointer data)
-{
-	log_debug("status_changed_cbk");
-	refresh();
-
-	return FALSE;
-}
-
 static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
 	log_fct_enter();
@@ -282,16 +273,11 @@ int main(int argc, char **argv)
 
 	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
 
-	w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
-
 	gtk_builder_connect_signals(builder, NULL);
 
 	g_signal_connect(w_treeview,
 			 "cursor-changed", (GCallback)cursor_changed_cbk,
 			 tasks);
-	g_signal_connect(w_status,
-			 "changed", (GCallback)status_changed_cbk,
-			 tasks);
 
 	g_object_unref(G_OBJECT(builder));
 
diff --git a/src/ui.c b/src/ui.c
index 90731fe..78262bd 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -73,13 +73,25 @@ static gboolean delete_event_cbk(GtkWidget *w, GdkEvent *evt, gpointer data)
 	return TRUE;
 }
 
+static int status_changed_cbk(GtkComboBox *w, gpointer data)
+{
+	log_debug("status_changed_cbk");
+	refresh();
+
+	return FALSE;
+}
+
 GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 {
 	GtkWindow *window;
 	int x, y, w, h;
 
 	window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
+
 	w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
+	g_signal_connect(w_status,
+			 "changed", (GCallback)status_changed_cbk,
+			 NULL);
 
 	w = g_settings_get_int(settings, "window-width");
 	h = g_settings_get_int(settings, "window-height");