diff options
| -rw-r--r-- | src/common/inbound.c | 2 | ||||
| -rw-r--r-- | src/common/outbound.c | 2 | ||||
| -rw-r--r-- | src/common/servlist.c | 7 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/menu.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 10 |
6 files changed, 15 insertions, 10 deletions
diff --git a/src/common/inbound.c b/src/common/inbound.c index 1fa53cca..f57207d1 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -1679,7 +1679,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str, /* if the SASL password is set AND auth mode is set to SASL, request SASL auth */ if (serv->loginmethod == LOGIN_SASL - && strcmp (extension, "sasl") != 0 + && strcmp (extension, "sasl") == 0 && strlen (serv->password) != 0) { strcat (buffer, "sasl "); diff --git a/src/common/outbound.c b/src/common/outbound.c index 6beaa2cc..9ddacb75 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -3877,7 +3877,7 @@ const struct commands xc_cmds[] = { {"ME", cmd_me, 0, 0, 1, N_("ME <action>, sends the action to the current channel (actions are written in the 3rd person, like /me jumps)")}, {"MENU", cmd_menu, 0, 0, 1, "MENU [-eX] [-i<ICONFILE>] [-k<mod>,<key>] [-m] [-pX] [-r<X,group>] [-tX] {ADD|DEL} <path> [command] [unselect command]\n" - " See http://docs.hexchat.org/en/latest/plugins.html#controlling-the-gui for more details."}, + " See http://hexchat.readthedocs.org/en/latest/plugins.html#controlling-the-gui for more details."}, {"MKICK", cmd_mkick, 1, 1, 1, N_("MKICK, Mass kicks everyone except you in the current channel (needs chanop)")}, {"MODE", cmd_mode, 1, 0, 1, 0}, diff --git a/src/common/servlist.c b/src/common/servlist.c index 1e06acd4..ceee3455 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -207,7 +207,7 @@ static const struct defaultserver def[] = {"EnterTheGame", 0}, {0, "IRC.EnterTheGame.Com"}, - {"EntropyNet", 0}, + {"EntropyNet", 0, 0, 0, LOGIN_SASL}, #ifdef USE_OPENSSL {0, "irc.entropynet.net/+6697"}, #endif @@ -510,7 +510,7 @@ static const struct defaultserver def[] = {0, "moo.slashnet.org"}, {0, "radon.slashnet.org"}, - {"Snoonet", 0}, + {"Snoonet", 0, 0, 0, LOGIN_SASL}, #ifdef USE_OPENSSL {0, "irc.snoonet.org/+6697"}, #endif @@ -550,6 +550,9 @@ static const struct defaultserver def[] = {0, "tahoma.starchat.net"}, {0, "neo.starchat.net"}, + {"StaticBox", 0, 0, 0, LOGIN_SASL}, + {0, "irc.staticbox.net"}, + {"Station51", 0}, #ifdef USE_OPENSSL {0, "irc.station51.net/+6697"}, diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 9793d917..c8a80369 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -135,6 +135,7 @@ static const GOptionEntry gopt_entries[] = {NULL} }; +#ifdef WIN32 static void create_msg_dialog (gchar *title, gchar *message) { @@ -152,6 +153,7 @@ create_msg_dialog (gchar *title, gchar *message) gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } +#endif int fe_args (int argc, char *argv[]) diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 1948348a..58c28e51 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1545,7 +1545,7 @@ menu_ctcpguiopen (void) static void menu_docs (GtkWidget *wid, gpointer none) { - fe_open_url ("http://docs.hexchat.org/"); + fe_open_url ("http://hexchat.readthedocs.org"); } /*static void diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 2c5b982f..2d46b95f 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -382,13 +382,13 @@ static const setting filexfer_settings[] = {ST_HEADER, N_("Maximum File Transfer Speeds (bytes per second)"), 0, 0, 0}, {ST_NUMBER, N_("One upload:"), P_OFFINTNL(hex_dcc_max_send_cps), - N_("Maximum speed for one transfer"), 0, 1000000}, + N_("Maximum speed for one transfer"), 0, 10000000}, {ST_NUMBER, N_("One download:"), P_OFFINTNL(hex_dcc_max_get_cps), - N_("Maximum speed for one transfer"), 0, 1000000}, + N_("Maximum speed for one transfer"), 0, 10000000}, {ST_NUMBER, N_("All uploads combined:"), P_OFFINTNL(hex_dcc_global_max_send_cps), - N_("Maximum speed for all files"), 0, 1000000}, + N_("Maximum speed for all files"), 0, 10000000}, {ST_NUMBER, N_("All downloads combined:"), P_OFFINTNL(hex_dcc_global_max_get_cps), - N_("Maximum speed for all files"), 0, 1000000}, + N_("Maximum speed for all files"), 0, 10000000}, {ST_END, 0, 0, 0, 0, 0} }; @@ -542,7 +542,7 @@ static const setting logging_settings[] = {ST_HEADER, N_("Logging"),0,0,0}, {ST_TOGGLE, N_("Display scrollback from previous session"), P_OFFINTNL(hex_text_replay), 0, 0, 0}, {ST_NUMBER, N_("Scrollback lines:"), P_OFFINTNL(hex_text_max_lines),0,0,100000}, - {ST_TOGGLE, N_("Enable logging of conversations to disk"), P_OFFINTNL(hex_irc_logging), 0, 0, 1}, + {ST_TOGGLE, N_("Enable logging of conversations to disk"), P_OFFINTNL(hex_irc_logging), 0, 0, 0}, {ST_ENTRY, N_("Log filename:"), P_OFFSETNL(hex_irc_logmask), 0, 0, sizeof prefs.hex_irc_logmask}, {ST_LABEL, N_("%s=Server %c=Channel %n=Network.")}, |