Mercurial > pidgin.yaz

diff libpurple/protocols/oscar/oscarcommon.h @ 31341:f8f853ab3aba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A followup commit to d849dc2a852a4ffdd345a150f0b88ab37de36e36. Daniel voiced discontent with how I silently fall back to insecure connection, so I changed the old 'Use SSL' checkbox to a XMPP-style dropdown (Require encryption/Use encryption if available/ Don't use encryption), as was discussed on devel@.
author ivan.komarov@soc.pidgin.im
date Thu, 04 Nov 2010 23:38:20 +0000
parents 4297feb30ad1
children 04ffd3b52283
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscarcommon.h	Thu Nov 04 18:28:48 2010 +0000
+++ b/libpurple/protocols/oscar/oscarcommon.h	Thu Nov 04 23:38:20 2010 +0000
@@ -39,6 +39,10 @@
 
 #define OSCAR_DEFAULT_LOGIN_PORT 5190
 
+#define OSCAR_OPPORTUNISTIC_ENCRYPTION "opportunistic_encryption"
+#define OSCAR_REQUIRE_ENCRYPTION "require_encryption"
+#define OSCAR_NO_ENCRYPTION "no_encryption"
+
 #ifndef _WIN32
 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1"
 #else
@@ -49,8 +53,8 @@
 #define OSCAR_DEFAULT_WEB_AWARE FALSE
 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
 #define OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS TRUE
-#define OSCAR_DEFAULT_USE_SSL TRUE
 #define OSCAR_DEFAULT_USE_CLIENTLOGIN TRUE
+#define OSCAR_DEFAULT_ENCRYPTION OSCAR_OPPORTUNISTIC_ENCRYPTION
 
 #ifdef _WIN32
 const char *oscar_get_locale_charset(void);