irc: move option irc.network.alternate_nick into servers (closes #633)

5 files changed, 54 insertions, 24 deletions

diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index cc976e585..9609f98b3 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -4532,7 +4532,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
         else
             weechat_printf (NULL, "  ipv6 . . . . . . . . : %s%s",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6]) ?
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6])) ?
                             _("on") : _("off"));
         /* ssl */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL]))
@@ -4542,7 +4542,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
         else
             weechat_printf (NULL, "  ssl. . . . . . . . . : %s%s",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL]) ?
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL])) ?
                             _("on") : _("off"));
         /* ssl_cert */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_CERT]))
@@ -4584,7 +4584,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
         else
             weechat_printf (NULL, "  ssl_verify . . . . . : %s%s",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ?
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY])) ?
                             _("on") : _("off"));
         /* password */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PASSWORD]))
@@ -4660,7 +4660,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
         else
             weechat_printf (NULL, "  autoconnect. . . . . : %s%s",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ?
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT])) ?
                             _("on") : _("off"));
         /* autoreconnect */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT]))
@@ -4670,7 +4670,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
         else
             weechat_printf (NULL, "  autoreconnect. . . . : %s%s",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ?
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT])) ?
                             _("on") : _("off"));
         /* autoreconnect_delay */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY]))
@@ -4690,6 +4690,16 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
             weechat_printf (NULL, "  nicks. . . . . . . . : %s'%s'",
                             IRC_COLOR_CHAT_VALUE,
                             weechat_config_string (server->options[IRC_SERVER_OPTION_NICKS]));
+        /* nicks_alternate */
+        if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE]))
+            weechat_printf (NULL, "  nicks_alternate. . . :   (%s)",
+                            (IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE)) ?
+                            _("on") : _("off"));
+        else
+            weechat_printf (NULL, "  nicksalternate . . . : %s%s",
+                            IRC_COLOR_CHAT_VALUE,
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) ?
+                            _("on") : _("off"));
         /* username */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERNAME]))
             weechat_printf (NULL, "  username . . . . . . :   ('%s')",
@@ -4762,7 +4772,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
         else
             weechat_printf (NULL, "  autorejoin . . . . . : %s%s",
                             IRC_COLOR_CHAT_VALUE,
-                            weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ?
+                            (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN])) ?
                             _("on") : _("off"));
         /* autorejoin_delay */
         if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY]))
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 8d7ce0920..c35d712fd 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -131,7 +131,6 @@ struct t_config_option *irc_config_color_topic_old;
 
 /* IRC config, network section */
 
-struct t_config_option *irc_config_network_alternate_nick;
 struct t_config_option *irc_config_network_autoreconnect_delay_growing;
 struct t_config_option *irc_config_network_autoreconnect_delay_max;
 struct t_config_option *irc_config_network_ban_mask_default;
@@ -1885,6 +1884,22 @@ irc_config_server_new_option (struct t_config_file *config_file,
                 callback_change, callback_change_data,
                 NULL, NULL);
             break;
+        case IRC_SERVER_OPTION_NICKS_ALTERNATE:
+            new_option = weechat_config_new_option (
+                config_file, section,
+                option_name, "boolean",
+                N_("get an alternate nick when all the declared nicks are "
+                   "already used on server: add some \"_\" until the nick has "
+                   "a length of 9, and then replace last char (or the two "
+                   "last chars) by a number from 1 to 99, until we find "
+                   "a nick not used on server"),
+                NULL, 0, 0,
+                default_value, value,
+                null_value_allowed,
+                callback_check_value, callback_check_value_data,
+                callback_change, callback_change_data,
+                NULL, NULL);
+            break;
         case IRC_SERVER_OPTION_USERNAME:
             new_option = weechat_config_new_option (
                 config_file, section,
@@ -2940,14 +2955,6 @@ irc_config_init ()
         return 0;
     }
 
-    irc_config_network_alternate_nick = weechat_config_new_option (
-        irc_config_file, ptr_section,
-        "alternate_nick", "boolean",
-        N_("get an alternate nick when the nick is already used on server: add "
-           "some \"_\" until the nick has a length of 9, and then replace last "
-           "char (or the two last chars) by a number from 1 to 99, until we "
-           "find a nick not used on server"),
-        NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     irc_config_network_autoreconnect_delay_growing = weechat_config_new_option (
         irc_config_file, ptr_section,
         "autoreconnect_delay_growing", "integer",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index cd0a766b5..88eff3723 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -172,7 +172,6 @@ extern struct t_config_option *irc_config_color_topic_current;
 extern struct t_config_option *irc_config_color_topic_new;
 extern struct t_config_option *irc_config_color_topic_old;
 
-extern struct t_config_option *irc_config_network_alternate_nick;
 extern struct t_config_option *irc_config_network_autoreconnect_delay_growing;
 extern struct t_config_option *irc_config_network_autoreconnect_delay_max;
 extern struct t_config_option *irc_config_network_ban_mask_default;
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 3a5d9d9fc..3abc50727 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -96,6 +96,7 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] =
   { "autoreconnect",        "on"                  },
   { "autoreconnect_delay",  "10"                  },
   { "nicks",                ""                    },
+  { "nicks_alternate",      "on"                  },
   { "username",             ""                    },
   { "realname",             ""                    },
   { "local_hostname",       ""                    },
@@ -624,8 +625,8 @@ irc_server_get_alternate_nick (struct t_irc_server *server)
 
         /* now we have tried all nicks in list */
 
-        /* if alternate nick is disabled, just return NULL */
-        if (!weechat_config_boolean (irc_config_network_alternate_nick))
+        /* if alternate nicks are disabled, just return NULL */
+        if (!IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE))
             return NULL;
 
         /* use main nick and we will add "_" and then number if needed */
@@ -5414,6 +5415,9 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
     if (!weechat_infolist_new_var_string (ptr_item, "nicks",
                                           IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_NICKS)))
         return 0;
+    if (!weechat_infolist_new_var_integer (ptr_item, "nicks_alternate",
+                                           IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE)))
+        return 0;
     if (!weechat_infolist_new_var_string (ptr_item, "username",
                                           IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME)))
         return 0;
@@ -5587,7 +5591,7 @@ irc_server_print_log ()
                                 "on" : "off");
         else
             weechat_log_printf ("  ipv6 . . . . . . . . : %s",
-                                weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_IPV6]) ?
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_IPV6])) ?
                                 "on" : "off");
         /* ssl */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SSL]))
@@ -5596,7 +5600,7 @@ irc_server_print_log ()
                                 "on" : "off");
         else
             weechat_log_printf ("  ssl. . . . . . . . . : %s",
-                                weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL]) ?
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL])) ?
                                 "on" : "off");
         /* ssl_cert */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SSL_CERT]))
@@ -5633,7 +5637,7 @@ irc_server_print_log ()
                                 "on" : "off");
         else
             weechat_log_printf ("  ssl_verify . . . . . : %s",
-                                weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ?
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL_VERIFY])) ?
                                 "on" : "off");
         /* password */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_PASSWORD]))
@@ -5687,7 +5691,7 @@ irc_server_print_log ()
                                 "on" : "off");
         else
             weechat_log_printf ("  autoconnect. . . . . : %s",
-                                weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ?
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOCONNECT])) ?
                                 "on" : "off");
         /* autoreconnect */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT]))
@@ -5696,7 +5700,7 @@ irc_server_print_log ()
                                 "on" : "off");
         else
             weechat_log_printf ("  autoreconnect. . . . : %s",
-                                weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ?
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT])) ?
                                 "on" : "off");
         /* autoreconnect_delay */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY]))
@@ -5712,6 +5716,15 @@ irc_server_print_log ()
         else
             weechat_log_printf ("  nicks. . . . . . . . : '%s'",
                                 weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_NICKS]));
+        /* nicks_alternate */
+        if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE]))
+            weechat_log_printf ("  nicks_alternate. . . : null (%s)",
+                                (IRC_SERVER_OPTION_BOOLEAN(ptr_server, IRC_SERVER_OPTION_NICKS_ALTERNATE)) ?
+                                "on" : "off");
+        else
+            weechat_log_printf ("  nicks_alternate. . . : %s",
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) ?
+                                "on" : "off");
         /* username */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_USERNAME]))
             weechat_log_printf ("  username . . . . . . : null ('%s')",
@@ -5759,7 +5772,7 @@ irc_server_print_log ()
                                 "on" : "off");
         else
             weechat_log_printf ("  autorejoin . . . . . : %s",
-                                weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ?
+                                (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOREJOIN])) ?
                                 "on" : "off");
         /* autorejoin_delay */
         if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY]))
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index a0f074e20..91401d55c 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -64,6 +64,7 @@ enum t_irc_server_option
     IRC_SERVER_OPTION_AUTORECONNECT, /* autoreconnect when disconnected      */
     IRC_SERVER_OPTION_AUTORECONNECT_DELAY, /* delay before trying again reco */
     IRC_SERVER_OPTION_NICKS,         /* nicknames (comma separated list)     */
+    IRC_SERVER_OPTION_NICKS_ALTERNATE, /* use alternate nicknames            */
     IRC_SERVER_OPTION_USERNAME,      /* user name                            */
     IRC_SERVER_OPTION_REALNAME,      /* real name                            */
     IRC_SERVER_OPTION_LOCAL_HOSTNAME,/* custom local hostname                */