Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
30646:a61147460879 | 30647:4297feb30ad1 |
---|---|
30 #include "prpl.h" | 30 #include "prpl.h" |
31 #include "version.h" | 31 #include "version.h" |
32 #include "notify.h" | 32 #include "notify.h" |
33 #include "status.h" | 33 #include "status.h" |
34 | 34 |
35 #define OSCAR_DEFAULT_LOGIN_SERVER "login.messaging.aol.com" | 35 #define AIM_DEFAULT_LOGIN_SERVER "login.oscar.aol.com" |
36 #define AIM_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com" | |
37 #define ICQ_DEFAULT_LOGIN_SERVER "login.icq.com" | |
38 #define ICQ_DEFAULT_SSL_LOGIN_SERVER "slogin.icq.com" | |
39 | |
36 #define OSCAR_DEFAULT_LOGIN_PORT 5190 | 40 #define OSCAR_DEFAULT_LOGIN_PORT 5190 |
37 #define OSCAR_DEFAULT_SSL_LOGIN_SERVER "slogin.oscar.aol.com" | 41 |
38 #define OSCAR_OLD_LOGIN_SERVER "login.oscar.aol.com" | |
39 #ifndef _WIN32 | 42 #ifndef _WIN32 |
40 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1" | 43 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1" |
41 #else | 44 #else |
42 #define OSCAR_DEFAULT_CUSTOM_ENCODING oscar_get_locale_charset() | 45 #define OSCAR_DEFAULT_CUSTOM_ENCODING oscar_get_locale_charset() |
43 #endif | 46 #endif |
94 void oscar_send_file(PurpleConnection *gc, const char *who, const char *file); | 97 void oscar_send_file(PurpleConnection *gc, const char *who, const char *file); |
95 PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who); | 98 PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who); |
96 gboolean oscar_offline_message(const PurpleBuddy *buddy); | 99 gboolean oscar_offline_message(const PurpleBuddy *buddy); |
97 void oscar_format_username(PurpleConnection *gc, const char *nick); | 100 void oscar_format_username(PurpleConnection *gc, const char *nick); |
98 GList *oscar_actions(PurplePlugin *plugin, gpointer context); | 101 GList *oscar_actions(PurplePlugin *plugin, gpointer context); |
99 void oscar_init(PurplePlugin *plugin); | 102 void oscar_init(PurplePlugin *plugin, gboolean is_icq); |