X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=8dc69badf1e30e6773e76acdd98b3fbb6dcfb64a;hb=6d9d1bc225b220fc4cf669fcbbe16f72eb07a6a4;hp=567b56cdf3aca5e40ca0942239f598506cd26d22;hpb=57b57bbf5da17be6f6d8085ae8d75a25bda2df82;p=ptask.git

diff --git a/src/main.c b/src/main.c
index 567b56c..8dc69ba 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,13 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#include <locale.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include <glib/gi18n.h>
 
@@ -30,6 +32,7 @@
 
 #include <log.h>
 #include <note.h>
+#include <settings.h>
 #include <tw.h>
 #include <ui.h>
 #include <ui_projecttree.h>
@@ -38,7 +41,6 @@
 
 static const char *program_name;
 static struct task **tasks;
-static GSettings *settings;
 
 static struct option long_options[] = {
 	{"version", no_argument, 0, 'v'},
@@ -96,7 +98,7 @@ void refresh()
 		old_tasks = tasks;
 		current_prj = ui_projecttree_get_project();
 		current_uuid = ui_tasktree_get_task_uuid();
-		ui_tasktree_update(NULL, NULL);
+		ui_tasktree_update(NULL);
 	} else {
 		old_tasks = NULL;
 		current_prj = NULL;
@@ -107,7 +109,7 @@ void refresh()
 
 	if (tasks) {
 		ui_projecttree_update(tasks);
-		ui_tasktree_update(tasks, current_prj);
+		ui_tasktree_update(tasks);
 		if (current_uuid)
 			ui_tasktree_set_selected_task(current_uuid);
 	} else {
@@ -154,7 +156,10 @@ int main(int argc, char **argv)
 {
 	GtkWindow *window;
 	GtkBuilder *builder;
-	int optc, cmdok, opti;
+	int optc, cmdok, opti, ret;
+	GError *err;
+	gchar *msg;
+	GtkMessageDialog *diag;
 
 	program_name = argv[0];
 
@@ -195,14 +200,36 @@ 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
+	err = NULL;
+	ret = gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
-		 NULL);
-	window = create_window(builder, settings);
+		 &err);
+
+	if (!ret) {
+		msg = g_strdup_printf(_("Failed to load UI: %s"),
+				      err->message);
+		log_err(msg);
+
+		diag = GTK_MESSAGE_DIALOG(gtk_message_dialog_new
+					  (NULL,
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   msg,
+					   NULL));
+
+		gtk_dialog_run(GTK_DIALOG(diag));
+
+		g_free(msg);
+
+		exit(EXIT_FAILURE);
+	}
+
+	window = create_window(builder);
 
 	gtk_builder_connect_signals(builder, NULL);