diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-05-10 13:57:42 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-05-10 13:57:42 +0000 |
| commit | bb4d7566c29162976f1d47ce51c1ffd1ce2041d6 (patch) | |
| tree | 796489749de7f4b7bc5db0376f800df0ad434732 /src/core | |
| parent | afc4fbc2238f9b76df9e704446ec9be64ee2f57b (diff) | |
| download | irssi-bb4d7566c29162976f1d47ce51c1ffd1ce2041d6.zip | |
iconfig's caching was a bit buggy - it didn't notice if some config node was
removed.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@213 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/log.c | 8 | ||||
| -rw-r--r-- | src/core/settings.h | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/core/log.c b/src/core/log.c index 69c2fab5..15d0a3f1 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -246,15 +246,15 @@ static void log_set_config(LOG_REC *log) if (log->autoopen) config_node_set_bool(node, "auto_open", TRUE); else - config_node_set_str(node, "auto_open", NULL); + iconfig_node_set_str(node, "auto_open", NULL); - config_node_set_str(node, "rotate", log_rotate2str(log->rotate)); + iconfig_node_set_str(node, "rotate", log_rotate2str(log->rotate)); levelstr = bits2level(log->level); - config_node_set_str(node, "level", levelstr); + iconfig_node_set_str(node, "level", levelstr); g_free(levelstr); - config_node_set_str(node, "items", NULL); + iconfig_node_set_str(node, "items", NULL); if (log->items != NULL && *log->items != NULL) { node = config_node_section(node, "items", NODE_TYPE_LIST); diff --git a/src/core/settings.h b/src/core/settings.h index 81599db3..6f29de6e 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -19,16 +19,19 @@ typedef struct { } SETTINGS_REC; /* macros for handling the default Irssi configuration */ -#define iconfig_get_str(a, b, c) config_get_str(mainconfig, a, b,c) -#define iconfig_get_int(a, b, c) config_get_int(mainconfig, a, b,c) -#define iconfig_get_bool(a, b, c) config_get_bool(mainconfig, a, b,c) +#define iconfig_get_str(a, b, c) config_get_str(mainconfig, a, b, c) +#define iconfig_get_int(a, b, c) config_get_int(mainconfig, a, b, c) +#define iconfig_get_bool(a, b, c) config_get_bool(mainconfig, a, b, c) #define iconfig_list_find(a, b, c, d) config_list_find(mainconfig, a, b, c, d) -#define iconfig_set_str(a, b, c) config_set_str(mainconfig, a, b,c) -#define iconfig_set_int(a, b, c) config_set_int(mainconfig, a, b,c) -#define iconfig_set_bool(a, b, c) config_set_bool(mainconfig, a, b,c) +#define iconfig_set_str(a, b, c) config_set_str(mainconfig, a, b, c) +#define iconfig_set_int(a, b, c) config_set_int(mainconfig, a, b, c) +#define iconfig_set_bool(a, b, c) config_set_bool(mainconfig, a, b, c) #define iconfig_node_traverse(a, b) config_node_traverse(mainconfig, a, b) +#define iconfig_node_set_str(a, b, c) config_node_set_str(mainconfig, a, b, c) +#define iconfig_node_list_remove(a, b) config_node_list_remove(mainconfig, a, b) +#define iconfig_node_remove(a, b) config_node_remove(mainconfig, a, b) extern CONFIG_REC *mainconfig; |