414 lines
8.7 KiB
Diff
414 lines
8.7 KiB
Diff
--- a/src/common/servlist.c 2024-01-08 21:59:00.000000000 +0100
|
|
+++ b/src/common/servlist.c 2024-01-08 22:06:05.648354845 +0100
|
|
@@ -37,336 +37,6 @@
|
|
#include "servlist.h"
|
|
|
|
|
|
-struct defaultserver
|
|
-{
|
|
- char *network;
|
|
- char *host;
|
|
- char *channel;
|
|
- char *charset;
|
|
- int loginmode; /* default authentication type */
|
|
- char *connectcmd; /* default connect command - should only be used for rare login types, paired with LOGIN_CUSTOM */
|
|
- gboolean ssl;
|
|
-};
|
|
-
|
|
-static const struct defaultserver def[] =
|
|
-{
|
|
- {"2600net", 0},
|
|
- /* Invalid hostname in cert */
|
|
- {0, "irc.2600.net"},
|
|
-
|
|
- {"2ch", 0, 0, "iso-2022-jp", 0, 0},
|
|
- {0, "irc.2ch.sc"},
|
|
- {0, "irc.nurs.or.jp"},
|
|
- {0, "irc.juggler.jp"},
|
|
-
|
|
- {"AccessIRC", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.accessirc.net"},
|
|
-
|
|
- {"AfterNET", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.afternet.org"},
|
|
-
|
|
- {"Aitvaras", 0},
|
|
-#ifdef USE_OPENSSL
|
|
- {0, "irc.data.lt/+6668"},
|
|
- {0, "irc.omnitel.net/+6668"},
|
|
- {0, "irc.ktu.lt/+6668"},
|
|
- {0, "irc.kis.lt/+6668"},
|
|
- {0, "irc.vub.lt/+6668"},
|
|
-#endif
|
|
- {0, "irc.data.lt"},
|
|
- {0, "irc.omnitel.net"},
|
|
- {0, "irc.ktu.lt"},
|
|
- {0, "irc.kis.lt"},
|
|
- {0, "irc.vub.lt"},
|
|
-
|
|
- {"Anthrochat", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.anthrochat.net"},
|
|
-
|
|
- {"ARCNet", 0},
|
|
- {0, "arcnet-irc.org"},
|
|
-
|
|
- {"AustNet", 0},
|
|
- {0, "irc.austnet.org"},
|
|
-
|
|
- {"AzzurraNet", 0},
|
|
- {0, "irc.azzurra.org"},
|
|
-
|
|
- {"BetaChat", 0, 0, 0, LOGIN_SASL},
|
|
- {0, "irc.betachat.net"},
|
|
- {"BuddyIM", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.buddy.im"},
|
|
- {"Canternet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.canternet.org"},
|
|
-
|
|
- {"Chat4all", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.chat4all.org"},
|
|
-
|
|
- {"ChatJunkies", 0},
|
|
- {0, "irc.chatjunkies.org"},
|
|
-
|
|
- {"ChatNet", 0},
|
|
- {0, "irc.chatnet.org"},
|
|
-
|
|
- {"ChatSpike", 0, 0, 0, LOGIN_SASL},
|
|
- {0, "irc.chatspike.net"},
|
|
-
|
|
- {"ChattingAway", 0},
|
|
- {0, "irc.chattingaway.com"},
|
|
-
|
|
- {"Criten", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.criten.net"},
|
|
-
|
|
- {"DALnet", 0, 0, 0, LOGIN_NICKSERV},
|
|
- /* Self signed */
|
|
- {0, "us.dal.net"},
|
|
-
|
|
- {"DarkMyst", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.darkmyst.org"},
|
|
-
|
|
- {"Dark-Tou-Net", 0},
|
|
- {0, "irc.d-t-net.de"},
|
|
-
|
|
- {"DeltaAnime", 0},
|
|
- {0, "irc.deltaanime.net"},
|
|
-
|
|
- {"EFnet", 0},
|
|
- {0, "irc.choopa.net"},
|
|
- {0, "irc.paraphysics.net"},
|
|
- {0, "efnet.port80.se"},
|
|
- {0, "irc.underworld.no"},
|
|
- {0, "irc.inet.tele.dk"},
|
|
-
|
|
- {"ElectroCode", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.electrocode.net"},
|
|
-
|
|
- {"EnterTheGame", 0},
|
|
- {0, "irc.enterthegame.com"},
|
|
-
|
|
- {"EntropyNet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.entropynet.net"},
|
|
-
|
|
- {"EsperNet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.esper.net"},
|
|
-
|
|
- {"EUIrc", 0},
|
|
- {0, "irc.euirc.net"},
|
|
-
|
|
- {"EuropNet", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.europnet.org"},
|
|
-
|
|
- {"FDFNet", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.fdfnet.net"},
|
|
-
|
|
- {"freenode", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "chat.freenode.net"},
|
|
- /* irc. points to chat. but many users and urls still reference it */
|
|
- {0, "irc.freenode.net"},
|
|
-
|
|
- {"GalaxyNet", 0},
|
|
- {0, "irc.galaxynet.org"},
|
|
-
|
|
- {"GameSurge", 0},
|
|
- {0, "irc.gamesurge.net"},
|
|
-
|
|
- {"GeeksIRC", 0, 0, 0, LOGIN_SASL},
|
|
- /* Self signed */
|
|
- {0, "irc.geeksirc.net"},
|
|
-
|
|
- {"GeekShed", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.geekshed.net"},
|
|
-
|
|
- {"German-Elite", 0, 0, "CP1252"},
|
|
- {0, "irc.german-elite.net"},
|
|
-
|
|
- {"GIMPNet", 0},
|
|
- /* Invalid hostname in cert */
|
|
- {0, "irc.gimp.org"},
|
|
- {0, "irc.gnome.org"},
|
|
-
|
|
- {"GlobalGamers", 0},
|
|
-#ifdef USE_OPENSSL
|
|
- {0, "irc.globalgamers.net/+6660"},
|
|
-#endif
|
|
- {0, "irc.globalgamers.net"},
|
|
-
|
|
-#ifdef USE_OPENSSL
|
|
- {"hackint", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.hackint.org"},
|
|
-#endif
|
|
-
|
|
- {"Hashmark", 0},
|
|
- {0, "irc.hashmark.net"},
|
|
-
|
|
- {"IdleMonkeys", 0},
|
|
- {0, "irc.idlemonkeys.net"},
|
|
-
|
|
- {"IndirectIRC", 0, 0, 0, LOGIN_SASL},
|
|
- /* Self signed */
|
|
- {0, "irc.indirectirc.com"},
|
|
-
|
|
- {"Interlinked", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.interlinked.me"},
|
|
-
|
|
- {"IRC4Fun", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.irc4fun.net"},
|
|
-
|
|
- {"IRCHighWay", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.irchighway.net"},
|
|
-
|
|
- {"IRCNet", 0},
|
|
- {0, "open.ircnet.net"},
|
|
-
|
|
- {"Irctoo.net", 0},
|
|
- {0, "irc.irctoo.net"},
|
|
-
|
|
- {"iZ-smart.net", 0, 0, "CP1252"},
|
|
- {0, "irc.iz-smart.net"},
|
|
-
|
|
- {"KBFail", 0},
|
|
- /* SSL is self-signed */
|
|
- {0, "irc.kbfail.net"},
|
|
-
|
|
- {"Krstarica", 0},
|
|
- {0, "irc.krstarica.com"},
|
|
-
|
|
- {"LibraIRC", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.librairc.net"},
|
|
-
|
|
- {"Libera.Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.libera.chat"},
|
|
-
|
|
-#ifdef USE_OPENSSL
|
|
- {"LinkNet", 0},
|
|
- {0, "irc.link-net.org/+7000"},
|
|
-#endif
|
|
-
|
|
- {"MindForge", 0, 0, 0, LOGIN_SASL},
|
|
- {0, "irc.mindforge.org"},
|
|
-
|
|
- {"MIXXnet", 0},
|
|
- {0, "irc.mixxnet.net"},
|
|
-
|
|
- {"Moznet", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.mozilla.org"},
|
|
-
|
|
- {"ObsidianIRC", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.obsidianirc.net"},
|
|
-
|
|
- {"Oceanius", 0, 0, 0, LOGIN_SASL},
|
|
- /* Self signed */
|
|
- {0, "irc.oceanius.com"},
|
|
-
|
|
- {"OFTC", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.oftc.net"},
|
|
-
|
|
- {"OtherNet", 0},
|
|
- {0, "irc.othernet.org"},
|
|
-
|
|
- {"OzNet", 0},
|
|
- {0, "irc.oz.org"},
|
|
-
|
|
- {"PIRC.PL", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.pirc.pl"},
|
|
-
|
|
- {"PonyChat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.ponychat.net"},
|
|
-
|
|
- {"PTNet.org", 0},
|
|
- /* Note that the network suggests ISO-8859-1 but most users ignore this */
|
|
- {0, "uevora.ptnet.org"},
|
|
- {0, "vianetworks.ptnet.org"},
|
|
-
|
|
- {"QuakeNet", 0, 0, 0, LOGIN_CHALLENGEAUTH},
|
|
- {0, "irc.quakenet.org"},
|
|
-
|
|
- {"Rizon", 0, 0, 0, 0, 0, TRUE},
|
|
- {0, "irc.rizon.net"},
|
|
-
|
|
- {"RusNet", 0, 0, "KOI8-R (Cyrillic)"},
|
|
- /* Self signed */
|
|
- {0, "irc.tomsk.net"},
|
|
- {0, "irc.run.net"},
|
|
- {0, "irc.ru"},
|
|
- {0, "irc.lucky.net"},
|
|
-
|
|
- {"SceneNet", 0},
|
|
- {0, "irc.scene.org"},
|
|
-
|
|
- {"SeilEn.de", 0, 0, "CP1252"},
|
|
- {0, "irc.seilen.de"},
|
|
-
|
|
- {"Serenity-IRC", 0},
|
|
- {0, "irc.serenity-irc.net"},
|
|
-
|
|
- {"SlashNET", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.slashnet.org"},
|
|
-
|
|
- {"Snoonet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.snoonet.org"},
|
|
-
|
|
- {"Sohbet.Net", 0, 0, "CP1254"},
|
|
- {0, "irc.sohbet.net"},
|
|
-
|
|
- {"SolidIRC", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.solidirc.com"},
|
|
-
|
|
- {"SorceryNet", 0, 0, 0, LOGIN_SASL},
|
|
- /* Self signed */
|
|
- {0, "irc.sorcery.net"},
|
|
-
|
|
- {"SpotChat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.spotchat.org"},
|
|
-
|
|
- {"StarChat", 0},
|
|
- {0, "irc.starchat.net"},
|
|
-
|
|
- {"Station51", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.station51.net"},
|
|
-
|
|
- {"StormBit", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.stormbit.net"},
|
|
-
|
|
- {"SwiftIRC", 0},
|
|
- /* Expired cert */
|
|
- {0, "irc.swiftirc.net"},
|
|
-
|
|
- {"synIRC", 0},
|
|
- /* Self signed */
|
|
- {0, "irc.synirc.net"},
|
|
-
|
|
- {"Techtronix", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.techtronix.net"},
|
|
-
|
|
- {"TURLINet", 0, 0, 0, 0, 0, TRUE},
|
|
- /* Other servers use CP1251 and invalid certs */
|
|
- {0, "irc.servx.ru"},
|
|
-
|
|
- {"UnderNet", 0, 0, 0, LOGIN_CUSTOM, "MSG x@channels.undernet.org login %u %p"},
|
|
- {0, "us.undernet.org"},
|
|
-
|
|
- {"UniBG", 0, 0, "CP1251", LOGIN_CUSTOM, "MSG NS IDENTIFY %p"},
|
|
- {0, "irc.lirex.com"},
|
|
- {0, "irc.naturella.com"},
|
|
- {0, "irc.techno-link.com"},
|
|
-
|
|
- {"Worldnet", 0},
|
|
- {0, "irc.worldnet.net"},
|
|
-
|
|
- {"Xertion", 0, 0, 0, LOGIN_SASL, 0, TRUE},
|
|
- {0, "irc.xertion.org"},
|
|
-
|
|
- {0,0}
|
|
-};
|
|
-
|
|
GSList *network_list = 0;
|
|
|
|
favchannel *
|
|
@@ -931,57 +601,6 @@
|
|
static void
|
|
servlist_load_defaults (void)
|
|
{
|
|
- int i = 0, j = 0;
|
|
- ircnet *net = NULL;
|
|
- guint def_hash = g_str_hash ("Libera.Chat");
|
|
-
|
|
- while (1)
|
|
- {
|
|
- if (def[i].network)
|
|
- {
|
|
- net = servlist_net_add (def[i].network, def[i].host, FALSE);
|
|
- if (def[i].channel)
|
|
- {
|
|
- servlist_favchan_add (net, def[i].channel);
|
|
- }
|
|
- if (def[i].charset)
|
|
- {
|
|
- net->encoding = g_strdup (def[i].charset);
|
|
- }
|
|
- else
|
|
- {
|
|
- net->encoding = g_strdup (IRC_DEFAULT_CHARSET);
|
|
- }
|
|
- if (def[i].loginmode)
|
|
- {
|
|
- net->logintype = def[i].loginmode;
|
|
- }
|
|
- if (def[i].connectcmd)
|
|
- {
|
|
- servlist_command_add (net, def[i].connectcmd);
|
|
- }
|
|
- if (def[i].ssl)
|
|
- {
|
|
- net->flags |= FLAG_USE_SSL;
|
|
- }
|
|
-
|
|
- if (g_str_hash (def[i].network) == def_hash)
|
|
- {
|
|
- prefs.hex_gui_slist_select = j;
|
|
- }
|
|
-
|
|
- j++;
|
|
- }
|
|
- else
|
|
- {
|
|
- servlist_server_add (net, def[i].host);
|
|
- if (!def[i+1].host && !def[i+1].network)
|
|
- {
|
|
- break;
|
|
- }
|
|
- }
|
|
- i++;
|
|
- }
|
|
}
|
|
|
|
static int
|
|
|
|
--- a/src/fe-gtk/joind.c 2024-01-08 21:53:25.000000000 +0100
|
|
+++ b/src/fe-gtk/joind.c 2024-01-08 21:53:55.961283136 +0100
|
|
@@ -245,12 +245,6 @@
|
|
G_CALLBACK (joind_radio2_cb), serv);
|
|
g_signal_connect (G_OBJECT (okbutton1), "clicked",
|
|
G_CALLBACK (joind_ok_cb), serv);
|
|
-
|
|
- if (serv->network)
|
|
- if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0)
|
|
- {
|
|
- gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat");
|
|
- }
|
|
|
|
gtk_widget_grab_focus (okbutton1);
|
|
gtk_widget_show_all (dialog1);
|