Changeset a6b00fc

Timestamp:

2015-02-28T23:17:33Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

ce70e88

Parents:

a880e34

git-author:

dequis <dx@…> (28-02-15 23:15:56)

git-committer:

dequis <dx@…> (28-02-15 23:17:33)

Message:

Disable msn by default :(

I didn't want to do the next release with a broken msn, but...
gotta be realistic.

Also featuring shameless plug.

File:

• protocols/msn/msn.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -41 +41 @@
         s->flags |= SET_NOSAVE | ACC_SET_ONLINE_ONLY;
 
-        s = set_add(&acc->set, "server", MSN_NS_HOST, set_eval_account, acc);
+        s = set_add(&acc->set, "server", NULL, set_eval_account, acc);
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
 
@@ -58 +58 @@
         struct im_connection *ic = imcb_new(acc);
         struct msn_data *md = g_new0(struct msn_data, 1);
+        char *server = set_getstr(&ic->acc->set, "server");
 
         ic->proto_data = md;
         ic->flags |= OPT_PONGS | OPT_PONGED;
+
+        if (!server) {
+                imcb_error(ic, "The msn protocol is disabled in this version because most servers disabled MSNP18 over port 1863.");
+                imcb_error(ic, "If you find a working server, you can change the 'server' setting of this account. Good luck!");
+                imcb_error(ic, "See also: http://ismsndeadyet.com/"); // shameless plug
+                imc_logout(ic, FALSE);
+                return;
+        }
 
         if (strchr(acc->user, '@') == NULL) {
@@ -76 +85 @@
 
         imcb_log(ic, "Connecting");
-        msn_ns_connect(ic, md->ns,
-                       set_getstr(&ic->acc->set, "server"),
+        msn_ns_connect(ic, md->ns, server,
                        set_getint(&ic->acc->set, "port"));
 }