Mercurial > pidgin
comparison libpurple/protocols/oscar/oscarcommon.h @ 30903:f8f853ab3aba
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 |
comparison
equal
deleted
inserted
replaced
30902:4f0d6ee5ffee | 30903:f8f853ab3aba |
---|---|
37 #define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com" | 37 #define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com" |
38 #define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com" | 38 #define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com" |
39 | 39 |
40 #define OSCAR_DEFAULT_LOGIN_PORT 5190 | 40 #define OSCAR_DEFAULT_LOGIN_PORT 5190 |
41 | 41 |
42 #define OSCAR_OPPORTUNISTIC_ENCRYPTION "opportunistic_encryption" | |
43 #define OSCAR_REQUIRE_ENCRYPTION "require_encryption" | |
44 #define OSCAR_NO_ENCRYPTION "no_encryption" | |
45 | |
42 #ifndef _WIN32 | 46 #ifndef _WIN32 |
43 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1" | 47 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1" |
44 #else | 48 #else |
45 #define OSCAR_DEFAULT_CUSTOM_ENCODING oscar_get_locale_charset() | 49 #define OSCAR_DEFAULT_CUSTOM_ENCODING oscar_get_locale_charset() |
46 #endif | 50 #endif |
47 #define OSCAR_DEFAULT_AUTHORIZATION TRUE | 51 #define OSCAR_DEFAULT_AUTHORIZATION TRUE |
48 #define OSCAR_DEFAULT_HIDE_IP TRUE | 52 #define OSCAR_DEFAULT_HIDE_IP TRUE |
49 #define OSCAR_DEFAULT_WEB_AWARE FALSE | 53 #define OSCAR_DEFAULT_WEB_AWARE FALSE |
50 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE | 54 #define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE |
51 #define OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS TRUE | 55 #define OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS TRUE |
52 #define OSCAR_DEFAULT_USE_SSL TRUE | |
53 #define OSCAR_DEFAULT_USE_CLIENTLOGIN TRUE | 56 #define OSCAR_DEFAULT_USE_CLIENTLOGIN TRUE |
57 #define OSCAR_DEFAULT_ENCRYPTION OSCAR_OPPORTUNISTIC_ENCRYPTION | |
54 | 58 |
55 #ifdef _WIN32 | 59 #ifdef _WIN32 |
56 const char *oscar_get_locale_charset(void); | 60 const char *oscar_get_locale_charset(void); |
57 #endif | 61 #endif |
58 PurpleMood* oscar_get_purple_moods(PurpleAccount *account); | 62 PurpleMood* oscar_get_purple_moods(PurpleAccount *account); |