fixed missing include

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d54e623..8891001 100644 (file)
--- 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,16 +41,6 @@
 
 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'},
@@ -134,18 +127,7 @@ void refresh()
        if (old_tasks)
                tw_task_list_free(old_tasks);
 
-       log_fct(__func__, "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()
@@ -174,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];
 
@@ -215,26 +200,37 @@ 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
+       ret = gtk_builder_add_from_file
                (builder,
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
-                NULL);
-       window = create_window(builder, settings);
+                &err);
 
-       ui_taskpanel_init(builder);
-       ui_tasktree_init(builder);
-       ui_projecttree_init(builder);
+       if (!ret) {
+               msg = g_strdup_printf(_("Failed to load UI: %s"),
+                                     err->message);
+               log_err(msg);
 
-       w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
+               diag = GTK_MESSAGE_DIALOG(gtk_message_dialog_new
+                                         (NULL,
+                                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                                          GTK_MESSAGE_ERROR,
+                                          GTK_BUTTONS_CLOSE,
+                                          msg,
+                                          NULL));
 
-       gtk_builder_connect_signals(builder, NULL);
+               gtk_dialog_run(GTK_DIALOG(diag));
+
+               g_free(msg);
+
+               exit(EXIT_FAILURE);
+       }
 
-       g_signal_connect(w_treeview,
-                        "cursor-changed", (GCallback)cursor_changed_cbk,
-                        tasks);
+       window = create_window(builder);
+
+       gtk_builder_connect_signals(builder, NULL);
 
        g_object_unref(G_OBJECT(builder));