Mercurial > pidgin
diff libpurple/protocols/oscar/oscarcommon.h @ 30647:4297feb30ad1
Merged everything related to ICQ server changes.
applied changes from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794
through d849dc2a852a4ffdd345a150f0b88ab37de36e36
applied changes from 7aedaac3ed815cab16d758474a829d5ec5a59e4b
through d849dc2a852a4ffdd345a150f0b88ab37de36e36
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Sat, 30 Oct 2010 21:36:34 +0000 |
| parents | 50d472b3d752 |
| children | f8f853ab3aba |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscarcommon.h Sat Oct 30 21:27:00 2010 +0000 +++ b/libpurple/protocols/oscar/oscarcommon.h Sat Oct 30 21:36:34 2010 +0000 @@ -32,10 +32,13 @@ #include "notify.h" #include "status.h" -#define OSCAR_DEFAULT_LOGIN_SERVER "login.messaging.aol.com" +#define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com" +#define AIM_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com" +#define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com" +#define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com" + #define OSCAR_DEFAULT_LOGIN_PORT 5190 -#define OSCAR_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com" -#define OSCAR_OLD_LOGIN_SERVER "login.oscar.aol.com" + #ifndef _WIN32 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1" #else @@ -96,4 +99,4 @@ gboolean oscar_offline_message(const PurpleBuddy *buddy); void oscar_format_username(PurpleConnection *gc, const char *nick); GList *oscar_actions(PurplePlugin *plugin, gpointer context); -void oscar_init(PurplePlugin *plugin); +void oscar_init(PurplePlugin *plugin, gboolean is_icq);