aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/oscar/conn.c
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2018-04-19 10:23:08 +0200
committerMarius Halden <marius.h@lden.org>2018-04-19 10:23:08 +0200
commitdb02ac8971379f9fee2f3a618bb08b8076d1a83d (patch)
tree0e7d46bad6162509300aa73ae6d77e571a5b26d0 /protocols/oscar/conn.c
parent6dc54671e368d03ed447d0fbd2d662af6c36b7fd (diff)
parent246b98bbdf221448fd7a638fea04373ed1612de5 (diff)
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols/oscar/conn.c')
-rw-r--r--protocols/oscar/conn.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/protocols/oscar/conn.c b/protocols/oscar/conn.c
index 3e84f1a4..aaee71de 100644
--- a/protocols/oscar/conn.c
+++ b/protocols/oscar/conn.c
@@ -474,13 +474,7 @@ void aim_session_init(aim_session_t *sess, guint32 flags, int debuglevel)
sess->emailinfo = NULL;
sess->oft_info = NULL;
-
- /*
- * Default to SNAC login unless XORLOGIN is explicitly set.
- */
- if (!(flags & AIM_SESS_FLAGS_XORLOGIN)) {
- sess->flags |= AIM_SESS_FLAGS_SNACLOGIN;
- }
+ sess->flags |= AIM_SESS_FLAGS_SNACLOGIN;
sess->flags |= flags;
/*