pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-09 11:13:12 +02:00
Code Activity

core: use type "enum" in options

Browse Source
This commit is contained in:
Sébastien Helleu
2023-07-06 21:16:56 +02:00
parent 66cb9f6ea2
commit 481e8f197d
37 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/irc/irc-bar-item.c
+3 -3
View File
@@ -69,7 +69,7 @@ irc_bar_item_buffer_plugin (const void *pointer, void *data,
if (ptr_plugin == weechat_irc_plugin)
{
irc_buffer_get_server_and_channel (buffer, &server, &channel);
if (weechat_config_integer (irc_config_look_item_display_server) == IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_PLUGIN)
if (weechat_config_enum (irc_config_look_item_display_server) == IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_PLUGIN)
{
if (server && channel)
{
@@ -127,7 +127,7 @@ irc_bar_item_buffer_name_content (struct t_gui_buffer *buffer, int short_name)
buf_name[0] = '\0';
display_server = (weechat_config_integer (irc_config_look_item_display_server) == IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_NAME);
display_server = (weechat_config_enum (irc_config_look_item_display_server) == IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_NAME);
irc_buffer_get_server_and_channel (buffer, &server, &channel);
if (server || channel)
@@ -330,7 +330,7 @@ irc_bar_item_channel (const void *pointer, void *data,
buf_name[0] = '\0';
modes[0] = '\0';
display_server = (weechat_config_integer (irc_config_look_item_display_server) == IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_NAME);
display_server = (weechat_config_enum (irc_config_look_item_display_server) == IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_NAME);
irc_buffer_get_server_and_channel (buffer, &server, &channel);
if (server || channel)
src/plugins/irc/irc-channel.c
+4 -4
View File
@@ -145,7 +145,7 @@ irc_channel_move_near_server (struct t_irc_server *server, int channel_type,
}
if ((number_found == 0)
&& (weechat_config_integer (irc_config_look_server_buffer) ==
&& (weechat_config_enum (irc_config_look_server_buffer) ==
IRC_CONFIG_LOOK_SERVER_BUFFER_INDEPENDENT))
{
number_found = weechat_buffer_get_integer (server->buffer, "number") + 1;
@@ -333,7 +333,7 @@ irc_channel_create_buffer (struct t_irc_server *server,
ptr_buffer_for_merge = NULL;
if (channel_type == IRC_CHANNEL_TYPE_PRIVATE)
{
switch (weechat_config_integer (irc_config_look_pv_buffer))
switch (weechat_config_enum (irc_config_look_pv_buffer))
{
case IRC_CONFIG_LOOK_PV_BUFFER_MERGE_BY_SERVER:
/* merge private buffers by server */
@@ -359,8 +359,8 @@ irc_channel_create_buffer (struct t_irc_server *server,
if (weechat_buffer_get_integer (ptr_buffer, "layout_number") < 1)
{
buffer_position = (channel_type == IRC_CHANNEL_TYPE_CHANNEL) ?
weechat_config_integer (irc_config_look_new_channel_position) :
weechat_config_integer (irc_config_look_new_pv_position);
weechat_config_enum (irc_config_look_new_channel_position) :
weechat_config_enum (irc_config_look_new_pv_position);
switch (buffer_position)
{
case IRC_CONFIG_LOOK_BUFFER_POSITION_NONE:
src/plugins/irc/irc-command.c
+9 -9
View File
@@ -1008,7 +1008,7 @@ IRC_COMMAND_CALLBACK(auth)
if (weechat_hashtable_has_key (ptr_server->cap_list, "sasl"))
{
/* SASL capability already enabled, authenticate */
sasl_mechanism = IRC_SERVER_OPTION_INTEGER(
sasl_mechanism = IRC_SERVER_OPTION_ENUM(
ptr_server, IRC_SERVER_OPTION_SASL_MECHANISM);
if ((sasl_mechanism >= 0)
&& (sasl_mechanism < IRC_NUM_SASL_MECHANISMS))
@@ -1278,11 +1278,11 @@ irc_command_away_server (struct t_irc_server *server, const char *arguments,
server->away_time = time (NULL);
irc_server_sendf (server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
"AWAY :%s", arguments);
if (weechat_config_integer (irc_config_look_display_away) != IRC_CONFIG_DISPLAY_AWAY_OFF)
if (weechat_config_enum (irc_config_look_display_away) != IRC_CONFIG_DISPLAY_AWAY_OFF)
{
string = irc_color_decode (arguments,
weechat_config_boolean (irc_config_network_colors_send));
if (weechat_config_integer (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_LOCAL)
if (weechat_config_enum (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_LOCAL)
{
irc_command_display_away (server, "away",
(string) ? string : arguments);
@@ -1350,9 +1350,9 @@ irc_command_away_server (struct t_irc_server *server, const char *arguments,
elapsed = (time_now >= server->away_time) ?
time_now - server->away_time : 0;
server->away_time = 0;
if (weechat_config_integer (irc_config_look_display_away) != IRC_CONFIG_DISPLAY_AWAY_OFF)
if (weechat_config_enum (irc_config_look_display_away) != IRC_CONFIG_DISPLAY_AWAY_OFF)
{
if (weechat_config_integer (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_LOCAL)
if (weechat_config_enum (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_LOCAL)
{
snprintf (buffer, sizeof (buffer),
"gone %.2ld:%.2ld:%.2ld",
@@ -5124,11 +5124,11 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
/* sasl_mechanism */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_MECHANISM]))
weechat_printf (NULL, " sasl_mechanism . . . : ('%s')",
irc_sasl_mechanism_string[IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_MECHANISM)]);
irc_sasl_mechanism_string[IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_MECHANISM)]);
else
weechat_printf (NULL, " sasl_mechanism . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
irc_sasl_mechanism_string[weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_MECHANISM])]);
irc_sasl_mechanism_string[weechat_config_enum (server->options[IRC_SERVER_OPTION_SASL_MECHANISM])]);
/* sasl_username */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_USERNAME]))
weechat_printf (NULL, " sasl_username. . . . : ('%s')",
@@ -5166,11 +5166,11 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
/* sasl_fail */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_FAIL]))
weechat_printf (NULL, " sasl_fail. . . . . . : ('%s')",
irc_server_sasl_fail_string[IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_FAIL)]);
irc_server_sasl_fail_string[IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_FAIL)]);
else
weechat_printf (NULL, " sasl_fail. . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
irc_server_sasl_fail_string[weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_FAIL])]);
irc_server_sasl_fail_string[weechat_config_enum (server->options[IRC_SERVER_OPTION_SASL_FAIL])]);
/* autoconnect */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOCONNECT]))
weechat_printf (NULL, " autoconnect. . . . . : (%s)",
src/plugins/irc/irc-completion.c
+2 -2
View File
@@ -329,12 +329,12 @@ irc_completion_channel_nicks_cb (const void *pointer, void *data,
WEECHAT_LIST_POS_SORT);
}
/* add recent speakers on channel */
if (weechat_config_integer (irc_config_look_nick_completion_smart) == IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS)
if (weechat_config_enum (irc_config_look_nick_completion_smart) == IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS)
{
irc_completion_channel_nicks_add_speakers (completion, ptr_server, ptr_channel, 0);
}
/* add nicks whose make highlights on me recently on this channel */
if (weechat_config_integer (irc_config_look_nick_completion_smart) == IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS_HIGHLIGHTS)
if (weechat_config_enum (irc_config_look_nick_completion_smart) == IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS_HIGHLIGHTS)
{
irc_completion_channel_nicks_add_speakers (completion, ptr_server, ptr_channel, 1);
}
src/plugins/irc/irc-config.c
+21 -21
View File
@@ -344,7 +344,7 @@ irc_config_change_look_display_away (const void *pointer, void *data,
(void) option;
if (!irc_config_loading
&& (weechat_config_integer (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_CHANNEL))
&& (weechat_config_enum (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_CHANNEL))
{
weechat_printf (
NULL,
@@ -428,13 +428,13 @@ irc_config_change_look_server_buffer (const void *pointer, void *data,
}
/* merge IRC server buffers with core buffer or another buffer */
if ((weechat_config_integer (irc_config_look_server_buffer) ==
if ((weechat_config_enum (irc_config_look_server_buffer) ==
IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITH_CORE)
|| (weechat_config_integer (irc_config_look_server_buffer) ==
|| (weechat_config_enum (irc_config_look_server_buffer) ==
IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITHOUT_CORE))
{
ptr_buffer =
(weechat_config_integer (irc_config_look_server_buffer) ==
(weechat_config_enum (irc_config_look_server_buffer) ==
IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITH_CORE) ?
weechat_buffer_search_main () : irc_buffer_search_server_lowest_number ();
@@ -483,8 +483,8 @@ irc_config_change_look_pv_buffer (const void *pointer, void *data,
}
/* merge IRC private buffers */
if ((weechat_config_integer (irc_config_look_pv_buffer) == IRC_CONFIG_LOOK_PV_BUFFER_MERGE_BY_SERVER)
|| (weechat_config_integer (irc_config_look_pv_buffer) == IRC_CONFIG_LOOK_PV_BUFFER_MERGE_ALL))
if ((weechat_config_enum (irc_config_look_pv_buffer) == IRC_CONFIG_LOOK_PV_BUFFER_MERGE_BY_SERVER)
|| (weechat_config_enum (irc_config_look_pv_buffer) == IRC_CONFIG_LOOK_PV_BUFFER_MERGE_ALL))
{
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
@@ -496,7 +496,7 @@ irc_config_change_look_pv_buffer (const void *pointer, void *data,
&& ptr_channel->buffer)
{
ptr_buffer = NULL;
switch (weechat_config_integer (irc_config_look_pv_buffer))
switch (weechat_config_enum (irc_config_look_pv_buffer))
{
case IRC_CONFIG_LOOK_PV_BUFFER_MERGE_BY_SERVER:
/* merge private buffers by server */
@@ -1474,7 +1474,7 @@ irc_config_msgbuffer_create_option (const void *pointer, void *data,
ptr_option = weechat_config_new_option (
config_file, section,
option_name, "integer",
option_name, "enum",
_("buffer used to display message received from IRC "
"server"),
"weechat|server|current|private", 0, 0, value, value, 0,
@@ -1951,7 +1951,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
case IRC_SERVER_OPTION_SASL_MECHANISM:
new_option = weechat_config_new_option (
config_file, section,
option_name, "integer",
option_name, "enum",
N_("mechanism for SASL authentication: "
"\"plain\" for plain text password, "
"\"scram-sha-1\" for SCRAM authentication with SHA-1 "
@@ -2057,7 +2057,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
case IRC_SERVER_OPTION_SASL_FAIL:
new_option = weechat_config_new_option (
config_file, section,
option_name, "integer",
option_name, "enum",
N_("action to perform if SASL authentication fails: "
"\"continue\" to ignore the authentication problem, "
"\"reconnect\" to schedule a reconnection to the server, "
@@ -2555,7 +2555,7 @@ irc_config_server_new_option (struct t_config_file *config_file,
case IRC_SERVER_OPTION_CHARSET_MESSAGE:
new_option = weechat_config_new_option (
config_file, section,
option_name, "integer",
option_name, "enum",
N_("part of the IRC message (received or sent) which is "
"decoded/encoded to the target charset; "
"message = the whole IRC message (default), "
@@ -2968,7 +2968,7 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_display_away = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"display_away", "integer",
"display_away", "enum",
N_("display message when (un)marking as away (off: do not "
"display/send anything, local: display locally, channel: send "
"action to channels)"),
@@ -3132,7 +3132,7 @@ irc_config_init ()
NULL, NULL, NULL);
irc_config_look_item_display_server = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"item_display_server", "integer",
"item_display_server", "enum",
N_("name of bar item where IRC server is displayed (for status bar)"),
"buffer_plugin|buffer_name", 0, 0, "buffer_plugin", NULL, 0,
NULL, NULL, NULL,
@@ -3165,14 +3165,14 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_msgbuffer_fallback = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"msgbuffer_fallback", "integer",
"msgbuffer_fallback", "enum",
N_("default target buffer for msgbuffer options when target is "
"private and that private buffer is not found"),
"current|server", 0, 0, "current", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_new_channel_position = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"new_channel_position", "integer",
"new_channel_position", "enum",
N_("force position of new channel in list of buffers "
"(none = default position (should be last buffer), "
"next = current buffer + 1, near_server = after last channel/pv "
@@ -3181,7 +3181,7 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_new_pv_position = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"new_pv_position", "integer",
"new_pv_position", "enum",
N_("force position of new private in list of buffers "
"(none = default position (should be last buffer), "
"next = current buffer + 1, near_server = after last channel/pv "
@@ -3190,7 +3190,7 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_nick_completion_smart = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"nick_completion_smart", "integer",
"nick_completion_smart", "enum",
N_("smart completion for nicks (completes first with last speakers): "
"speakers = all speakers (including highlights), "
"speakers_highlights = only speakers with highlight"),
@@ -3198,7 +3198,7 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_nick_mode = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"nick_mode", "integer",
"nick_mode", "enum",
N_("display nick mode (op, voice, ...) before nick (none = never, "
"prefix = in prefix only (default), action = in action messages "
"only, both = prefix + action messages)"),
@@ -3226,7 +3226,7 @@ irc_config_init ()
NULL, NULL, NULL);
irc_config_look_notice_as_pv = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"notice_as_pv", "integer",
"notice_as_pv", "enum",
N_("display notices as private messages (if auto, use private "
"buffer if found)"),
"auto|never|always", 0, 0, "auto", NULL, 0,
@@ -3274,7 +3274,7 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_pv_buffer = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"pv_buffer", "integer",
"pv_buffer", "enum",
N_("merge private buffers"),
"independent|merge_by_server|merge_all", 0, 0, "independent", NULL, 0,
NULL, NULL, NULL,
@@ -3315,7 +3315,7 @@ irc_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_server_buffer = weechat_config_new_option (
irc_config_file, irc_config_section_look,
"server_buffer", "integer",
"server_buffer", "enum",
N_("merge server buffers; this option has no effect if a layout "
"is saved and is conflicting with this value (see /help layout)"),
"merge_with_core|merge_without_core|independent", 0, 0, "merge_with_core",
src/plugins/irc/irc-msgbuffer.c
+1 -1
View File
@@ -122,7 +122,7 @@ irc_msgbuffer_get_target_buffer (struct t_irc_server *server, const char *nick,
ptr_channel = irc_channel_search (server, nick);
if (ptr_channel)
return ptr_channel->buffer;
if (weechat_config_integer (irc_config_look_msgbuffer_fallback) ==
if (weechat_config_enum (irc_config_look_msgbuffer_fallback) ==
IRC_CONFIG_LOOK_MSGBUFFER_FALLBACK_SERVER)
{
return (server) ? server->buffer : NULL;
src/plugins/irc/irc-nick.c
+1 -1
View File
@@ -913,7 +913,7 @@ irc_nick_mode_for_display (struct t_irc_server *server, struct t_irc_nick *nick,
str_prefix[0] = (nick) ? nick->prefix[0] : '\0';
str_prefix[1] = '\0';
nick_mode = weechat_config_integer (irc_config_look_nick_mode);
nick_mode = weechat_config_enum (irc_config_look_nick_mode);
if ((nick_mode == IRC_CONFIG_LOOK_NICK_MODE_BOTH)
|| (prefix && (nick_mode == IRC_CONFIG_LOOK_NICK_MODE_PREFIX))
|| (!prefix && (nick_mode == IRC_CONFIG_LOOK_NICK_MODE_ACTION)))
src/plugins/irc/irc-protocol.c
+6 -6
View File
@@ -554,7 +554,7 @@ IRC_PROTOCOL_CALLBACK(authenticate)
irc_server_sasl_get_creds (server, &sasl_username, &sasl_password,
&sasl_key);
sasl_mechanism = IRC_SERVER_OPTION_INTEGER(
sasl_mechanism = IRC_SERVER_OPTION_ENUM(
server, IRC_SERVER_OPTION_SASL_MECHANISM);
answer = NULL;
@@ -922,7 +922,7 @@ irc_protocol_cap_sync (struct t_irc_server *server, int sasl)
if (weechat_config_boolean (irc_config_network_sasl_fail_unavailable))
{
/* same handling as for sasl_end_fail */
sasl_fail = IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_FAIL);
sasl_fail = IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_FAIL);
if ((sasl_fail == IRC_SERVER_SASL_FAIL_RECONNECT)
|| (sasl_fail == IRC_SERVER_SASL_FAIL_DISCONNECT))
{
@@ -1219,7 +1219,7 @@ IRC_PROTOCOL_CALLBACK(cap)
if (sasl_to_do)
{
sasl_mechanism = IRC_SERVER_OPTION_INTEGER(
sasl_mechanism = IRC_SERVER_OPTION_ENUM(
server, IRC_SERVER_OPTION_SASL_MECHANISM);
if ((sasl_mechanism >= 0)
&& (sasl_mechanism < IRC_NUM_SASL_MECHANISMS))
@@ -2634,11 +2634,11 @@ IRC_PROTOCOL_CALLBACK(notice)
ptr_channel = NULL;
if (nick
&& weechat_config_integer (irc_config_look_notice_as_pv) != IRC_CONFIG_LOOK_NOTICE_AS_PV_NEVER)
&& weechat_config_enum (irc_config_look_notice_as_pv) != IRC_CONFIG_LOOK_NOTICE_AS_PV_NEVER)
{
ptr_channel = irc_channel_search (server, nick);
if (!ptr_channel
&& weechat_config_integer (irc_config_look_notice_as_pv) == IRC_CONFIG_LOOK_NOTICE_AS_PV_ALWAYS)
&& weechat_config_enum (irc_config_look_notice_as_pv) == IRC_CONFIG_LOOK_NOTICE_AS_PV_ALWAYS)
{
ptr_channel = irc_channel_new (server,
IRC_CHANNEL_TYPE_PRIVATE,
@@ -7742,7 +7742,7 @@ IRC_PROTOCOL_CALLBACK(sasl_end_fail)
IRC_PROTOCOL_RUN_CALLBACK(numeric);
sasl_fail = IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_FAIL);
sasl_fail = IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_FAIL);
if (!server->is_connected
&& ((sasl_fail == IRC_SERVER_SASL_FAIL_RECONNECT)
|| (sasl_fail == IRC_SERVER_SASL_FAIL_DISCONNECT)))
src/plugins/irc/irc-server.c
+13 -14
View File
@@ -546,7 +546,7 @@ irc_server_sasl_enabled (struct t_irc_server *server)
irc_server_sasl_get_creds (server,
&sasl_username, &sasl_password, &sasl_key);
sasl_mechanism = IRC_SERVER_OPTION_INTEGER(
sasl_mechanism = IRC_SERVER_OPTION_ENUM(
server, IRC_SERVER_OPTION_SASL_MECHANISM);
/*
@@ -2927,8 +2927,8 @@ irc_server_send_one_msg (struct t_irc_server *server, int flags,
NULL, /* pos_arguments */
&pos_channel,
&pos_text);
switch (IRC_SERVER_OPTION_INTEGER(server,
IRC_SERVER_OPTION_CHARSET_MESSAGE))
switch (IRC_SERVER_OPTION_ENUM(server,
IRC_SERVER_OPTION_CHARSET_MESSAGE))
{
case IRC_SERVER_CHARSET_MESSAGE_MESSAGE:
pos_encode = 0;
@@ -3517,8 +3517,8 @@ irc_server_msgq_flush ()
msg_decoded = NULL;
switch (IRC_SERVER_OPTION_INTEGER(irc_recv_msgq->server,
IRC_SERVER_OPTION_CHARSET_MESSAGE))
switch (IRC_SERVER_OPTION_ENUM(irc_recv_msgq->server,
IRC_SERVER_OPTION_CHARSET_MESSAGE))
{
case IRC_SERVER_CHARSET_MESSAGE_MESSAGE:
pos_decode = 0;
@@ -3847,8 +3847,7 @@ irc_server_timer_sasl_cb (const void *pointer, void *data, int remaining_calls)
weechat_printf (server->buffer,
_("%s%s: SASL authentication timeout"),
weechat_prefix ("error"), IRC_PLUGIN_NAME);
sasl_fail = IRC_SERVER_OPTION_INTEGER(server,
IRC_SERVER_OPTION_SASL_FAIL);
sasl_fail = IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_FAIL);
if ((sasl_fail == IRC_SERVER_SASL_FAIL_RECONNECT)
|| (sasl_fail == IRC_SERVER_SASL_FAIL_DISCONNECT))
{
@@ -4700,7 +4699,7 @@ irc_server_create_buffer (struct t_irc_server *server)
struct t_hashtable *buffer_props;
ptr_buffer_for_merge = NULL;
switch (weechat_config_integer (irc_config_look_server_buffer))
switch (weechat_config_enum (irc_config_look_server_buffer))
{
case IRC_CONFIG_LOOK_SERVER_BUFFER_MERGE_WITH_CORE:
/* merge with WeeChat core buffer */
@@ -6598,7 +6597,7 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES)))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "sasl_mechanism",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_MECHANISM)))
IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_MECHANISM)))
return 0;
if (!weechat_infolist_new_var_string (ptr_item, "sasl_username",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SASL_USERNAME)))
@@ -6610,7 +6609,7 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SASL_KEY)))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "sasl_fail",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_FAIL)))
IRC_SERVER_OPTION_ENUM(server, IRC_SERVER_OPTION_SASL_FAIL)))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "autoconnect",
IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTOCONNECT)))
@@ -6984,10 +6983,10 @@ irc_server_print_log ()
/* sasl_mechanism */
if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SASL_MECHANISM]))
weechat_log_printf (" sasl_mechanism. . . . . . : null ('%s')",
irc_sasl_mechanism_string[IRC_SERVER_OPTION_INTEGER(ptr_server, IRC_SERVER_OPTION_SASL_MECHANISM)]);
irc_sasl_mechanism_string[IRC_SERVER_OPTION_ENUM(ptr_server, IRC_SERVER_OPTION_SASL_MECHANISM)]);
else
weechat_log_printf (" sasl_mechanism. . . . . . : '%s'",
irc_sasl_mechanism_string[weechat_config_integer (ptr_server->options[IRC_SERVER_OPTION_SASL_MECHANISM])]);
irc_sasl_mechanism_string[weechat_config_enum (ptr_server->options[IRC_SERVER_OPTION_SASL_MECHANISM])]);
/* sasl_username */
if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SASL_USERNAME]))
weechat_log_printf (" sasl_username . . . . . . : null ('%s')",
@@ -7010,10 +7009,10 @@ irc_server_print_log ()
/* sasl_fail */
if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SASL_FAIL]))
weechat_log_printf (" sasl_fail . . . . . . . . : null ('%s')",
irc_server_sasl_fail_string[IRC_SERVER_OPTION_INTEGER(ptr_server, IRC_SERVER_OPTION_SASL_FAIL)]);
irc_server_sasl_fail_string[IRC_SERVER_OPTION_ENUM(ptr_server, IRC_SERVER_OPTION_SASL_FAIL)]);
else
weechat_log_printf (" sasl_fail . . . . . . . . : '%s'",
irc_server_sasl_fail_string[weechat_config_integer (ptr_server->options[IRC_SERVER_OPTION_SASL_FAIL])]);
irc_server_sasl_fail_string[weechat_config_enum (ptr_server->options[IRC_SERVER_OPTION_SASL_FAIL])]);
/* autoconnect */
if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTOCONNECT]))
weechat_log_printf (" autoconnect . . . . . . . : null (%s)",
src/plugins/logger/logger-buffer.c
+2 -2
View File
@@ -351,7 +351,7 @@ logger_buffer_compress_file (struct t_logger_buffer *logger_buffer)
const char *ptr_extension;
int compression_type, compression_level;
compression_type = weechat_config_integer (
compression_type = weechat_config_enum (
logger_config_file_rotation_compression_type);
ptr_extension = logger_buffer_compression_extension[compression_type];
@@ -475,7 +475,7 @@ logger_buffer_rotate (struct t_logger_buffer *logger_buffer)
logger_buffer->log_filename);
}
compression_type = weechat_config_integer (
compression_type = weechat_config_enum (
logger_config_file_rotation_compression_type);
ptr_extension = logger_buffer_compression_extension[compression_type];
src/plugins/logger/logger-config.c
+1 -1
View File
@@ -658,7 +658,7 @@ logger_config_init ()
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
logger_config_file_rotation_compression_type = weechat_config_new_option (
logger_config_file, logger_config_section_file,
"rotation_compression_type", "integer",
"rotation_compression_type", "enum",
N_("compression type for rotated log files; if set to \"none\", "
"rotated log files are not compressed; WARNING: if rotation was "
"enabled with another type of compression (or no compression), "
src/plugins/trigger/trigger-buffer.c
+2 -2
View File
@@ -57,7 +57,7 @@ trigger_buffer_match_filters (struct t_trigger *trigger)
{
/* check if the hook matches the filter */
if (weechat_strcasecmp (
trigger_hook_type_string[weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK])],
trigger_hook_type_string[weechat_config_enum (trigger->options[TRIGGER_OPTION_HOOK])],
trigger_buffer_filters[i] + 1) == 0)
{
return 1;
@@ -355,7 +355,7 @@ trigger_buffer_display_trigger (struct t_trigger *trigger,
"--> %s%lu\t%s: %s%s %s(%s%s%s)%s",
weechat_color (weechat_config_string (trigger_config_color_identifier)),
context->id,
trigger_hook_type_string[weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK])],
trigger_hook_type_string[weechat_config_enum (trigger->options[TRIGGER_OPTION_HOOK])],
weechat_color ("chat_status_enabled"),
trigger->name,
weechat_color ("chat_delimiters"),
src/plugins/trigger/trigger-callback.c
+2 -2
View File
@@ -147,7 +147,7 @@ trigger_callback_set_common_vars (struct t_trigger *trigger,
weechat_hashtable_set (
hashtable, "tg_hook_type",
trigger_hook_type_string[
weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK])]);
weechat_config_enum (trigger->options[TRIGGER_OPTION_HOOK])]);
}
/*
@@ -396,7 +396,7 @@ trigger_callback_regex (struct t_trigger *trigger,
ptr_key = (trigger->regex[i].variable) ?
trigger->regex[i].variable :
trigger_hook_regex_default_var[weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK])];
trigger_hook_regex_default_var[weechat_config_enum (trigger->options[TRIGGER_OPTION_HOOK])];
if (!ptr_key || !ptr_key[0])
{
if (trigger_buffer && display_monitor)
src/plugins/trigger/trigger-callback.h
+2 -2
View File
@@ -54,7 +54,7 @@ struct t_trigger_context
trigger->hook_count_cb++; \
trigger->hook_running = 1; \
trigger_rc = trigger_return_code[ \
weechat_config_integer ( \
weechat_config_enum ( \
trigger->options[TRIGGER_OPTION_RETURN_CODE])];
#define TRIGGER_CALLBACK_CB_NEW_POINTERS \
@@ -88,7 +88,7 @@ struct t_trigger_context
if (ctx.vars_updated) \
weechat_list_free (ctx.vars_updated); \
trigger->hook_running = 0; \
switch (weechat_config_integer ( \
switch (weechat_config_enum ( \
trigger->options[TRIGGER_OPTION_POST_ACTION])) \
{ \
case TRIGGER_POST_ACTION_DISABLE: \
src/plugins/trigger/trigger-command.c
+3 -3
View File
@@ -254,8 +254,8 @@ trigger_command_display_trigger (struct t_trigger *trigger, int verbose)
trigger->regex,
trigger->commands_count,
trigger->commands,
weechat_config_integer (trigger->options[TRIGGER_OPTION_RETURN_CODE]),
weechat_config_integer (trigger->options[TRIGGER_OPTION_POST_ACTION]),
weechat_config_enum (trigger->options[TRIGGER_OPTION_RETURN_CODE]),
weechat_config_enum (trigger->options[TRIGGER_OPTION_POST_ACTION]),
verbose);
}
@@ -877,7 +877,7 @@ trigger_command_trigger (const void *pointer, void *data,
argv[2]);
goto end;
}
add_rc = trigger_hook_default_rc[weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_HOOK])][0];
add_rc = trigger_hook_default_rc[weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_HOOK])][0];
arg_arguments = trigger_command_escape_argument (
weechat_config_string (ptr_trigger->options[TRIGGER_OPTION_ARGUMENTS]));
arg_conditions = trigger_command_escape_argument (
src/plugins/trigger/trigger-config.c
+3 -3
View File
@@ -375,7 +375,7 @@ trigger_config_create_trigger_option (const char *trigger_name, int index_option
case TRIGGER_OPTION_HOOK:
ptr_option = weechat_config_new_option (
trigger_config_file, trigger_config_section_trigger,
option_name, "integer",
option_name, "enum",
N_("type of hook used"),
trigger_hook_option_values,
0, 0, value, NULL, 0,
@@ -440,7 +440,7 @@ trigger_config_create_trigger_option (const char *trigger_name, int index_option
case TRIGGER_OPTION_RETURN_CODE:
ptr_option = weechat_config_new_option (
trigger_config_file, trigger_config_section_trigger,
option_name, "integer",
option_name, "enum",
N_("return code for hook callback (see plugin API reference to "
"know where ok_eat/error can be used efficiently)"),
"ok|ok_eat|error", 0, 0, value, NULL, 0,
@@ -449,7 +449,7 @@ trigger_config_create_trigger_option (const char *trigger_name, int index_option
case TRIGGER_OPTION_POST_ACTION:
ptr_option = weechat_config_new_option (
trigger_config_file, trigger_config_section_trigger,
option_name, "integer",
option_name, "enum",
N_("action to take on the trigger after execution"),
"none|disable|delete", 0, 0, value, NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
src/plugins/trigger/trigger.c
+7 -7
View File
@@ -329,7 +329,7 @@ trigger_hook (struct t_trigger *trigger)
0,
NULL);
switch (weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK]))
switch (weechat_config_enum (trigger->options[TRIGGER_OPTION_HOOK]))
{
case TRIGGER_HOOK_SIGNAL:
if (argv && (argc >= 1))
@@ -1290,8 +1290,8 @@ trigger_print_log ()
weechat_log_printf (" enabled . . . . . . . . : %d",
weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_ENABLED]));
weechat_log_printf (" hook . . . . . . . . . : %d ('%s')",
weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_HOOK]),
trigger_hook_type_string[weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_HOOK])]);
weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_HOOK]),
trigger_hook_type_string[weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_HOOK])]);
weechat_log_printf (" arguments . . . . . . . : '%s'",
weechat_config_string (ptr_trigger->options[TRIGGER_OPTION_ARGUMENTS]));
weechat_log_printf (" conditions. . . . . . . : '%s'",
@@ -1301,11 +1301,11 @@ trigger_print_log ()
weechat_log_printf (" command . . . . . . . . : '%s'",
weechat_config_string (ptr_trigger->options[TRIGGER_OPTION_COMMAND]));
weechat_log_printf (" return_code . . . . . . : %d ('%s')",
weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_RETURN_CODE]),
trigger_return_code_string[weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_RETURN_CODE])]);
weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_RETURN_CODE]),
trigger_return_code_string[weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_RETURN_CODE])]);
weechat_log_printf (" post_action . . . . . . : %d ('%s')",
weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_POST_ACTION]),
trigger_post_action_string[weechat_config_integer (ptr_trigger->options[TRIGGER_OPTION_POST_ACTION])]);
weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_POST_ACTION]),
trigger_post_action_string[weechat_config_enum (ptr_trigger->options[TRIGGER_OPTION_POST_ACTION])]);
weechat_log_printf (" hooks_count . . . . . . : %d", ptr_trigger->hooks_count);
weechat_log_printf (" hooks . . . . . . . . . : 0x%lx", ptr_trigger->hooks);
for (i = 0; i < ptr_trigger->hooks_count; i++)