diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2007-12-08 00:34:17 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2007-12-08 00:34:17 +0100 |
| commit | 7b4af2b243a7bf582fcd05104ed41a1a03422772 (patch) | |
| tree | b40a00f4b686520e98945dace3ca30db67d035c1 /src/core | |
| parent | 1e2eacdfe5da6700c306d0f5331821ec1b359778 (diff) | |
| download | weechat-7b4af2b243a7bf582fcd05104ed41a1a03422772.zip | |
Added config_reload event for IRC plugin
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/wee-config-file.c | 24 | ||||
| -rw-r--r-- | src/core/weechat.c | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c index 8568fcd71..55dfddefb 100644 --- a/src/core/wee-config-file.c +++ b/src/core/wee-config-file.c @@ -827,10 +827,13 @@ config_file_reload (struct t_config_file *config_file) for (ptr_section = config_file->sections; ptr_section; ptr_section = ptr_section->next_section) { - for (ptr_option = ptr_section->options; ptr_option; - ptr_option = ptr_option->next_option) + if (!ptr_section->callback_read) { - ptr_option->loaded = 0; + for (ptr_option = ptr_section->options; ptr_option; + ptr_option = ptr_option->next_option) + { + ptr_option->loaded = 0; + } } } @@ -841,15 +844,18 @@ config_file_reload (struct t_config_file *config_file) for (ptr_section = config_file->sections; ptr_section; ptr_section = ptr_section->next_section) { - for (ptr_option = ptr_section->options; ptr_option; - ptr_option = ptr_option->next_option) + if (!ptr_section->callback_read) { - if (!ptr_option->loaded) + for (ptr_option = ptr_section->options; ptr_option; + ptr_option = ptr_option->next_option) { - if (config_file_option_reset (ptr_option) == 2) + if (!ptr_option->loaded) { - if (ptr_option->callback_change) - (void) (ptr_option->callback_change) (); + if (config_file_option_reset (ptr_option) == 2) + { + if (ptr_option->callback_change) + (void) (ptr_option->callback_change) (); + } } } } diff --git a/src/core/weechat.c b/src/core/weechat.c index 8e8eca7de..3e4c8bd13 100644 --- a/src/core/weechat.c +++ b/src/core/weechat.c @@ -327,7 +327,7 @@ weechat_parse_args (int argc, char *argv[]) _("Warning: unable to create server " "('%s'), ignored\n"), argv[i]); - irc_server_destroy (&server_tmp); + irc_server_free_data (&server_tmp); server_cmd_line = 1; } }*/ |