X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=e692723e42cfc5ca896bb07125ea6f02e55916e5;hb=5b28468c1d7f28cdb664c6e23d71c48d4645901f;hp=bafb3b40146e02dd0a3ffc0a4f1c54d24115ca37;hpb=781a99f9dbdf4aa086c7d33392f7201d5f731ed2;p=ptask.git

diff --git a/src/main.c b/src/main.c
index bafb3b4..e692723 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,7 +22,7 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include <glib/gi18n.h>
 
@@ -30,6 +30,7 @@
 
 #include <log.h>
 #include <note.h>
+#include <settings.h>
 #include <tw.h>
 #include <ui.h>
 #include <ui_projecttree.h>
@@ -38,15 +39,6 @@
 
 static const char *program_name;
 static struct task **tasks;
-static GSettings *settings;
-
-enum {
-	COL_ID,
-	COL_DESCRIPTION,
-	COL_PROJECT,
-	COL_UUID,
-	COL_PRIORITY
-};
 
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
@@ -203,18 +195,14 @@ int main(int argc, char **argv)
 
 	gtk_init(NULL, NULL);
 
-	settings = g_settings_new("ptask");
+	settings_init();
 
 	builder = gtk_builder_new();
 	gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
 		 NULL);
-	window = create_window(builder, settings);
-
-	ui_taskpanel_init(builder);
-	ui_tasktree_init(builder);
-	ui_projecttree_init(builder);
+	window = create_window(builder);
 
 	gtk_builder_connect_signals(builder, NULL);