projects
/
ptask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support of json-0 and json-c (different include dirs)
[ptask.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
bafb3b4
..
e692723
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-22,7
+22,7
@@
#include <getopt.h>
#include <sys/stat.h>
#include <getopt.h>
#include <sys/stat.h>
-#include <json
/json
.h>
+#include <json.h>
#include <glib/gi18n.h>
#include <glib/gi18n.h>
@@
-30,6
+30,7
@@
#include <log.h>
#include <note.h>
#include <log.h>
#include <note.h>
+#include <settings.h>
#include <tw.h>
#include <ui.h>
#include <ui_projecttree.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 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'},
static struct option long_options[] = {
{"version", no_argument, 0, 'v'},
@@
-203,18
+195,14
@@
int main(int argc, char **argv)
gtk_init(NULL, NULL);
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);
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);
gtk_builder_connect_signals(builder, NULL);