diff options
| author | Ankit Vani <a@nevitus.org> | 2013-08-27 04:18:00 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2013-08-27 04:18:00 +0530 |
| commit | edba97aa34cb95d8b7dab56038490ee8fa04d0ed (patch) | |
| tree | b39bf93260daebf6d8ff0c4bfc2850cc20594f6a /libpurple/protocols/yahoo | |
| parent | 64c733a95cd1887dd996c66c2802632762194acf (diff) | |
| parent | 70560762a28f1242efeb209ab9df3dc6a3fa35be (diff) | |
| download | pidgin-edba97aa34cb95d8b7dab56038490ee8fa04d0ed.tar.gz | |
Merged default branch
Diffstat (limited to 'libpurple/protocols/yahoo')
| -rw-r--r-- | libpurple/protocols/yahoo/libyahoo.c | 3 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libyahoojp.c | 3 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libymsg.c | 6 | ||||
| -rw-r--r-- | libpurple/protocols/yahoo/libymsg.h | 1 |
4 files changed, 11 insertions, 2 deletions
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c index 7424584e2a..e26d330412 100644 --- a/libpurple/protocols/yahoo/libyahoo.c +++ b/libpurple/protocols/yahoo/libyahoo.c @@ -264,7 +264,8 @@ static PurplePluginProtocolInfo prpl_info = NULL, /* get_media_caps */ NULL, /* get_moods */ NULL, /* set_public_alias */ - NULL /* get_public_alias */ + NULL, /* get_public_alias */ + yahoo_get_max_message_size }; static PurplePluginInfo info = diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/libyahoojp.c index 69928ca1fa..e6d5471030 100644 --- a/libpurple/protocols/yahoo/libyahoojp.c +++ b/libpurple/protocols/yahoo/libyahoojp.c @@ -162,7 +162,8 @@ static PurplePluginProtocolInfo prpl_info = NULL, /* get_media_caps */ NULL, /* get_moods */ NULL, /* set_public_alias */ - NULL /* get_public_alias */ + NULL, /* get_public_alias */ + yahoo_get_max_message_size }; static PurplePluginInfo info = diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c index 8cc96c8ec1..79c484d777 100644 --- a/libpurple/protocols/yahoo/libymsg.c +++ b/libpurple/protocols/yahoo/libymsg.c @@ -5130,3 +5130,9 @@ GList *yahoo_attention_types(PurpleAccount *account) return list; } +gsize +yahoo_get_max_message_size(PurpleConnection *gc) +{ + /* got from pidgin-otr */ + return 799; +} diff --git a/libpurple/protocols/yahoo/libymsg.h b/libpurple/protocols/yahoo/libymsg.h index ba042b6d55..28d077530f 100644 --- a/libpurple/protocols/yahoo/libymsg.h +++ b/libpurple/protocols/yahoo/libymsg.h @@ -384,6 +384,7 @@ GList *yahoo_attention_types(PurpleAccount *account); GList *yahoo_actions(PurplePlugin *plugin, gpointer context); void yahoopurple_register_commands(void); +gsize yahoo_get_max_message_size(PurpleConnection *gc); PurpleCmdRet yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gchar **error, void *data); PurpleCmdRet yahoopurple_cmd_chat_join(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data); |