fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save and restore daemon configuration options.

Browse Source
This commit is contained in:
Frederic Culot 2009-08-01 17:44:51 +00:00
parent 71d6cfda92
commit 989b6c885f
4 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -5,6 +5,11 @@
* src/notify.c (print_option, notify_app_txt): new functions * src/notify.c (print_option, notify_app_txt): new functions
notification configuration menu updated with daemon-related notification configuration menu updated with daemon-related
variables 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> 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_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> 2009-07-27 Frederic Culot <frederic@culot.org>

18
src/custom.c
View File

@ -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 * Calcurse - text-based organizer
@ -319,6 +319,14 @@ custom_load_conf (conf_t *conf, int background)
conf->input_datefmt = 1; conf->input_datefmt = 1;
var = 0; var = 0;
break; 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: default:
EXIT (_("configuration variable unknown")); EXIT (_("configuration variable unknown"));
/* NOTREACHED */ /* NOTREACHED */
@ -352,10 +360,14 @@ custom_load_conf (conf_t *conf, int background)
var = CUSTOM_CONF_NOTIFYBARWARNING; var = CUSTOM_CONF_NOTIFYBARWARNING;
else if (strncmp (e_conf, "notify-bar_command=", 19) == 0) else if (strncmp (e_conf, "notify-bar_command=", 19) == 0)
var = CUSTOM_CONF_NOTIFYBARCOMMAND; 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; 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; 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__); file_close (data_file, __FILE_POS__);
pthread_mutex_unlock (&nbar.mutex); pthread_mutex_unlock (&nbar.mutex);

6
src/custom.h
View File

@ -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 * 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. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -76,6 +76,8 @@ enum
CUSTOM_CONF_NOTIFYBARCOMMAND, CUSTOM_CONF_NOTIFYBARCOMMAND,
CUSTOM_CONF_OUTPUTDATEFMT, CUSTOM_CONF_OUTPUTDATEFMT,
CUSTOM_CONF_INPUTDATEFMT, CUSTOM_CONF_INPUTDATEFMT,
CUSTOM_CONF_DMON_ENABLE,
CUSTOM_CONF_DMON_LOG,
CUSTOM_CONF_VARIABLES CUSTOM_CONF_VARIABLES
}; };

15
src/io.c
View File

@ -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 * Calcurse - text-based organizer
@ -940,7 +940,18 @@ io_save_conf (conf_t *conf)
if (ui_mode == UI_CURSES) if (ui_mode == UI_CURSES)
pthread_mutex_unlock (&nbar.mutex); 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__); file_close (fp, __FILE_POS__);
return 1; return 1;