irc: rename server option "umodes" to "usermode"

5 files changed, 30 insertions, 28 deletions

diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index f1c56c8e3..bab3f2e67 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -4718,6 +4718,14 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  local_hostname . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_string (server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME]));
+        /* usermode */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERMODE]))
+            weechat_printf (NULL, "  usermode . . . . . . :   ('%s')",
+                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERMODE));
+        else
+            weechat_printf (NULL, "  usermode . . . . . . : %s'%s'",
+                            IRC_COLOR_CHAT_VALUE,
+                            weechat_config_string (server->options[IRC_SERVER_OPTION_USERMODE]));
         /* command */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_COMMAND]))
         {
@@ -4858,14 +4866,6 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  notify . . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_string (server->options[IRC_SERVER_OPTION_NOTIFY]));
-        /* umodes*/
-        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_UMODES]))
-            weechat_printf (NULL, "  umodes . . . . . . . :   ('%s')",
-                            IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_UMODES));
-        else
-            weechat_printf (NULL, "  umodes . . . . . . . : %s'%s'",
-                            IRC_COLOR_CHAT_VALUE,
-                            weechat_config_string (server->options[IRC_SERVER_OPTION_UMODES]));
     }
     else
     {
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 7370002b3..d21c76230 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -2244,12 +2244,14 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 callback_change_data,
                 NULL, NULL, NULL);
             break;
-        case IRC_SERVER_OPTION_UMODES:
+        case IRC_SERVER_OPTION_USERMODE:
             new_option = weechat_config_new_option (
                 config_file, section,
                 option_name, "string",
-                N_("umode(s) to set after connection to server and before "
-                   "auto-join of channels"),
+                N_("usermode to set after connection to server and before "
+                   "executing command and the auto-join of channels; this "
+                   "option gives same result as defining a command "
+                   "\"/mode $nick <mode>\""),
                 NULL, 0, 0,
                 default_value, value,
                 null_value_allowed,
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index ba1f3eb85..d3ebf16c2 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -2453,7 +2453,7 @@ IRC_PROTOCOL_CALLBACK(wallops)
 IRC_PROTOCOL_CALLBACK(001)
 {
     char *server_command, **commands, **ptr_command, *vars_replaced, *away_msg;
-    const char *umodes;
+    const char *usermode;
 
     IRC_PROTOCOL_MIN_ARGS(3);
 
@@ -2493,14 +2493,14 @@ IRC_PROTOCOL_CALLBACK(001)
     (void) weechat_hook_signal_send ("irc_server_connected",
                                      WEECHAT_HOOK_SIGNAL_STRING, server->name);
 
-    /* set umodes when connected */
-    umodes = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_UMODES);
-    if (umodes && umodes[0])
+    /* set usermode when connected */
+    usermode = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERMODE);
+    if (usermode && usermode[0])
     {
         irc_server_sendf (server,
                           IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL,
                           "MODE %s %s",
-                          server->nick, umodes);
+                          server->nick, usermode);
     }
 
     /* execute command when connected */
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 5b4d80138..a0832cac6 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -102,6 +102,7 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] =
   { "username",             ""                        },
   { "realname",             ""                        },
   { "local_hostname",       ""                        },
+  { "usermode",             ""                        },
   { "command",              ""                        },
   { "command_delay",        "0"                       },
   { "autojoin",             ""                        },
@@ -116,7 +117,6 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] =
   { "msg_part",             "WeeChat ${info:version}" },
   { "msg_quit",             "WeeChat ${info:version}" },
   { "notify",               ""                        },
-  { "umodes",               ""                        },
 };
 
 char *irc_server_casemapping_string[IRC_SERVER_NUM_CASEMAPPING] =
@@ -5522,6 +5522,9 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
     if (!weechat_infolist_new_var_string (ptr_item, "local_hostname",
                                           IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME)))
         return 0;
+    if (!weechat_infolist_new_var_string (ptr_item, "usermode",
+                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERMODE)))
+        return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "command",
                                           IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_COMMAND)))
         return 0;
@@ -5561,9 +5564,6 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
     if (!weechat_infolist_new_var_string (ptr_item, "msg_quit",
                                           IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_MSG_QUIT)))
         return 0;
-    if (!weechat_infolist_new_var_string (ptr_item, "umodes",
-                                          IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_UMODES)))
-        return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "temp_server", server->temp_server))
         return 0;
     if (!weechat_infolist_new_var_integer (ptr_item, "index_current_address", server->index_current_address))
@@ -5844,6 +5844,13 @@ irc_server_print_log ()
         else
             weechat_log_printf ("  local_hostname . . . : '%s'",
                                 weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME]));
+        /* usermode */
+        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_USERMODE]))
+            weechat_log_printf ("  usermode . . . . . . : null ('%s')",
+                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_USERMODE));
+        else
+            weechat_log_printf ("  usermode . . . . . . : '%s'",
+                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_USERMODE]));
         /* command */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_COMMAND]))
             weechat_log_printf ("  command. . . . . . . : null");
@@ -5935,13 +5942,6 @@ irc_server_print_log ()
         else
             weechat_log_printf ("  msg_quit . . . . . . : '%s'",
                                 weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_MSG_QUIT]));
-        /* umodes */
-        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_UMODES]))
-            weechat_log_printf ("  umodes . . . . . . . : null ('%s')",
-                                IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_UMODES));
-        else
-            weechat_log_printf ("  umodes . . . . . . . : '%s'",
-                                weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_UMODES]));
         /* other server variables */
         weechat_log_printf ("  temp_server. . . . . : %d",    ptr_server->temp_server);
         weechat_log_printf ("  reloading_from_config: %d",    ptr_server->reloaded_from_config);
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index b032b9a61..2e475bdba 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -68,6 +68,7 @@ enum t_irc_server_option
     IRC_SERVER_OPTION_USERNAME,      /* user name                            */
     IRC_SERVER_OPTION_REALNAME,      /* real name                            */
     IRC_SERVER_OPTION_LOCAL_HOSTNAME,/* custom local hostname                */
+    IRC_SERVER_OPTION_USERMODE,      /* usermode to set once connected       */
     IRC_SERVER_OPTION_COMMAND,       /* command to run once connected        */
     IRC_SERVER_OPTION_COMMAND_DELAY, /* delay after execution of command     */
     IRC_SERVER_OPTION_AUTOJOIN,      /* channels to automatically join       */
@@ -82,7 +83,6 @@ enum t_irc_server_option
     IRC_SERVER_OPTION_MSG_PART,             /* default part message          */
     IRC_SERVER_OPTION_MSG_QUIT,             /* default quit message          */
     IRC_SERVER_OPTION_NOTIFY,               /* notify list                   */
-    IRC_SERVER_OPTION_UMODES,               /* umodes to set once connected  */
     /* number of server options */
     IRC_SERVER_NUM_OPTIONS,
 };