aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Culot <calcurse@culot.org>2009-08-01 17:44:51 +0000
committerFrederic Culot <calcurse@culot.org>2009-08-01 17:44:51 +0000
commit989b6c885f06f887cb8dafcd69059c376988d938 (patch)
tree9021fa630bffc46dfb881a4e72c48fde21e42ee3
parent71d6cfda92e55915bfc20e012e2bc069ff6aad99 (diff)
downloadcalcurse-989b6c885f06f887cb8dafcd69059c376988d938.tar.gz
calcurse-989b6c885f06f887cb8dafcd69059c376988d938.zip
Save and restore daemon configuration options.
-rwxr-xr-xChangeLog7
-rwxr-xr-xsrc/custom.c18
-rwxr-xr-xsrc/custom.h6
-rwxr-xr-xsrc/io.c15
4 files changed, 38 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bed632..81deeba 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
* src/notify.c (print_option, notify_app_txt): new functions
notification configuration menu updated with daemon-related
variables
+
+ * src/io.c (io_save_conf): save daemon configuration options
+
+ * src/custom (custom_load_conf): restore daemon configuration
+ options
2009-07-29 Frederic Culot <frederic@culot.org>
@@ -18,7 +23,7 @@
* src/notify.c (notify_launch_cmd): return an error code
- * src/notify.c (notify_get_next_bckg): new function
+ * src/notify.c (notify_get_next_bkgd): new function
2009-07-27 Frederic Culot <frederic@culot.org>
diff --git a/src/custom.c b/src/custom.c
index 679d914..a6a92d7 100755
--- a/src/custom.c
+++ b/src/custom.c
@@ -1,4 +1,4 @@
-/* $calcurse: custom.c,v 1.42 2009/07/29 18:20:54 culot Exp $ */
+/* $calcurse: custom.c,v 1.43 2009/08/01 17:44:51 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -319,6 +319,14 @@ custom_load_conf (conf_t *conf, int background)
conf->input_datefmt = 1;
var = 0;
break;
+ case CUSTOM_CONF_DMON_ENABLE:
+ dmon.enable = fill_config_var (e_conf);
+ var = 0;
+ break;
+ case CUSTOM_CONF_DMON_LOG:
+ dmon.log = fill_config_var (e_conf);
+ var = 0;
+ break;
default:
EXIT (_("configuration variable unknown"));
/* NOTREACHED */
@@ -352,10 +360,14 @@ custom_load_conf (conf_t *conf, int background)
var = CUSTOM_CONF_NOTIFYBARWARNING;
else if (strncmp (e_conf, "notify-bar_command=", 19) == 0)
var = CUSTOM_CONF_NOTIFYBARCOMMAND;
- else if (strncmp (e_conf, "output_datefmt=", 12) == 0)
+ else if (strncmp (e_conf, "output_datefmt=", 15) == 0)
var = CUSTOM_CONF_OUTPUTDATEFMT;
- else if (strncmp (e_conf, "input_datefmt=", 12) == 0)
+ else if (strncmp (e_conf, "input_datefmt=", 14) == 0)
var = CUSTOM_CONF_INPUTDATEFMT;
+ else if (strncmp (e_conf, "notify-daemon_enable=", 21) == 0)
+ var = CUSTOM_CONF_DMON_ENABLE;
+ else if (strncmp (e_conf, "notify-daemon_log=", 18) == 0)
+ var = CUSTOM_CONF_DMON_LOG;
}
file_close (data_file, __FILE_POS__);
pthread_mutex_unlock (&nbar.mutex);
diff --git a/src/custom.h b/src/custom.h
index a921c7b..317413a 100755
--- a/src/custom.h
+++ b/src/custom.h
@@ -1,9 +1,9 @@
-/* $calcurse: custom.h,v 1.16 2009/07/05 20:33:18 culot Exp $ */
+/* $calcurse: custom.h,v 1.17 2009/08/01 17:44:51 culot Exp $ */
/*
* Calcurse - text-based organizer
*
- * Copyright (c) 2004-2008 Frederic Culot <frederic@culot.org>
+ * Copyright (c) 2004-2009 Frederic Culot <frederic@culot.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,8 @@ enum
CUSTOM_CONF_NOTIFYBARCOMMAND,
CUSTOM_CONF_OUTPUTDATEFMT,
CUSTOM_CONF_INPUTDATEFMT,
+ CUSTOM_CONF_DMON_ENABLE,
+ CUSTOM_CONF_DMON_LOG,
CUSTOM_CONF_VARIABLES
};
diff --git a/src/io.c b/src/io.c
index 97b424d..eb14e19 100755
--- a/src/io.c
+++ b/src/io.c
@@ -1,4 +1,4 @@
-/* $calcurse: io.c,v 1.76 2009/07/29 18:20:55 culot Exp $ */
+/* $calcurse: io.c,v 1.77 2009/08/01 17:44:52 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -940,7 +940,18 @@ io_save_conf (conf_t *conf)
if (ui_mode == UI_CURSES)
pthread_mutex_unlock (&nbar.mutex);
-
+
+ (void)fprintf (fp, "\n# If this option is set to yes, "
+ "calcurse will run in background to get notifications "
+ "after exiting\n");
+ (void)fprintf (fp, "notify-daemon_enable=\n");
+ (void)fprintf (fp, "%s\n", dmon.enable ? "yes" : "no");
+
+ (void)fprintf (fp, "\n# If this option is set to yes, "
+ "activity will be logged when running in background\n");
+ (void)fprintf (fp, "notify-daemon_log=\n");
+ (void)fprintf (fp, "%s\n", dmon.log ? "yes" : "no");
+
file_close (fp, __FILE_POS__);
return 1;