diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/wee-command.c | 11 | ||||
| -rw-r--r-- | src/core/wee-config-file.c | 12 | ||||
| -rw-r--r-- | src/core/wee-hook.c | 4 | ||||
| -rw-r--r-- | src/core/wee-upgrade-file.c | 2 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 3fdc1a836..a36fdacf5 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -1126,11 +1126,11 @@ command_help (void *data, struct t_gui_buffer *buffer, _("type"), _("string")); gui_chat_printf (NULL, " %s: %s", _("values"), string); - gui_chat_printf (NULL, " %s: '%s'", + gui_chat_printf (NULL, " %s: \"%s\"", _("default value"), ptr_option->string_values[CONFIG_INTEGER_DEFAULT(ptr_option)]); gui_chat_printf (NULL, - " %s: '%s%s%s'", + " %s: \"%s%s%s\"", _("current value"), GUI_COLOR(GUI_COLOR_CHAT_HOST), ptr_option->string_values[CONFIG_INTEGER(ptr_option)], @@ -1178,10 +1178,10 @@ command_help (void *data, struct t_gui_buffer *buffer, ptr_option->max); break; } - gui_chat_printf (NULL, " %s: '%s'", + gui_chat_printf (NULL, " %s: \"%s\"", _("default value"), CONFIG_STRING_DEFAULT(ptr_option)); - gui_chat_printf (NULL, " %s: '%s%s%s'", + gui_chat_printf (NULL, " %s: \"%s%s%s\"", _("current value"), GUI_COLOR(GUI_COLOR_CHAT_HOST), CONFIG_STRING(ptr_option), @@ -1516,7 +1516,8 @@ command_layout_display_tree (struct t_gui_layout_window *layout_window, /* leaf */ snprintf (format, sizeof (format), "%%-%ds%s", indent * 2, - _("leaf: id: %d, parent: %d, plugin: '%s', buffer: '%s'")); + _("leaf: id: %d, parent: %d, plugin: \"%s\", " + "buffer: \"%s\"")); gui_chat_printf (NULL, format, " ", layout_window->internal_id, diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c index 67524806f..637f20150 100644 --- a/src/core/wee-config-file.c +++ b/src/core/wee-config-file.c @@ -2393,8 +2393,8 @@ config_file_print_stdout (struct t_config_file *config_file) { case CONFIG_OPTION_TYPE_BOOLEAN: string_iconv_fprintf (stdout, _(" . type: boolean\n")); - string_iconv_fprintf (stdout, _(" . values: 'on' or 'off'\n")); - string_iconv_fprintf (stdout, _(" . default value: '%s'\n"), + string_iconv_fprintf (stdout, _(" . values: \"on\" or \"off\"\n")); + string_iconv_fprintf (stdout, _(" . default value: \"%s\"\n"), (CONFIG_BOOLEAN_DEFAULT(ptr_option) == CONFIG_BOOLEAN_TRUE) ? "on" : "off"); break; @@ -2406,14 +2406,14 @@ config_file_print_stdout (struct t_config_file *config_file) i = 0; while (ptr_option->string_values[i]) { - string_iconv_fprintf (stdout, "'%s'", + string_iconv_fprintf (stdout, "\"%s\"", ptr_option->string_values[i]); if (ptr_option->string_values[i + 1]) string_iconv_fprintf (stdout, ", "); i++; } string_iconv_fprintf (stdout, "\n"); - string_iconv_fprintf (stdout, _(" . default value: '%s'\n"), + string_iconv_fprintf (stdout, _(" . default value: \"%s\"\n"), ptr_option->string_values[CONFIG_INTEGER_DEFAULT(ptr_option)]); } else @@ -2443,14 +2443,14 @@ config_file_print_stdout (struct t_config_file *config_file) ptr_option->max); break; } - string_iconv_fprintf (stdout, _(" . default value: '%s'\n"), + string_iconv_fprintf (stdout, _(" . default value: \"%s\"\n"), CONFIG_STRING_DEFAULT(ptr_option)); break; case CONFIG_OPTION_TYPE_COLOR: color_name = gui_color_get_name (CONFIG_COLOR_DEFAULT(ptr_option)); string_iconv_fprintf (stdout, _(" . type: color\n")); string_iconv_fprintf (stdout, _(" . values: color (depends on GUI used)\n")); - string_iconv_fprintf (stdout, _(" . default value: '%s'\n"), + string_iconv_fprintf (stdout, _(" . default value: \"%s\"\n"), color_name); break; case CONFIG_NUM_OPTION_TYPES: diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c index 56861714f..0de375a52 100644 --- a/src/core/wee-hook.c +++ b/src/core/wee-hook.c @@ -176,14 +176,14 @@ hook_remove_from_list (struct t_hook *hook) last_weechat_hook[hook->type] = hook->prev_hook; if (hook->prev_hook) { - hook->prev_hook->next_hook = hook->next_hook; + (hook->prev_hook)->next_hook = hook->next_hook; new_hooks = weechat_hooks[hook->type]; } else new_hooks = hook->next_hook; if (hook->next_hook) - hook->next_hook->prev_hook = hook->prev_hook; + (hook->next_hook)->prev_hook = hook->prev_hook; free (hook); diff --git a/src/core/wee-upgrade-file.c b/src/core/wee-upgrade-file.c index e8f5fa13a..a8ee02d42 100644 --- a/src/core/wee-upgrade-file.c +++ b/src/core/wee-upgrade-file.c @@ -54,7 +54,7 @@ upgrade_file_error (struct t_upgrade_file *upgrade_file, char *message1, char *message2, char *file, int line) { gui_chat_printf (NULL, - _("%sError upgrading WeeChat with file '%s':"), + _("%sError upgrading WeeChat with file \"%s\":"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], upgrade_file->filename); gui_chat_printf (NULL, |