diff options
author | Gary Kramlich <grim@reaperworld.com> | 2021-01-11 01:51:14 -0600 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2021-01-11 01:51:14 -0600 |
commit | baa93686e5a2aa61826bf8381a3c0ad21b408416 (patch) | |
tree | aca4845c3c8680483817cccda623944edd7140b7 /libpurple/server.c | |
parent | 287a9eded8c0afebf8d6267e7f5b869d64401038 (diff) | |
download | pidgin-baa93686e5a2aa61826bf8381a3c0ad21b408416.tar.gz |
Split PurpleProtocolChat to its own file and clean up the API.
Testing Done:
* Compiled and tested bonjour (not affected) and irc locally.
* Built and verified the docs.
* verified `ninja pidgin-pot` was successful.
Bugs closed: 17457
Reviewed at https://reviews.imfreedom.org/r/406/
Diffstat (limited to 'libpurple/server.c')
-rw-r--r-- | libpurple/server.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libpurple/server.c b/libpurple/server.c index 870981adf3..58e49f8282 100644 --- a/libpurple/server.c +++ b/libpurple/server.c @@ -35,6 +35,7 @@ #include "protocol.h" #include "purpleprivate.h" #include "purpleprotocolattention.h" +#include "purpleprotocolchat.h" #include "purpleprotocolim.h" #include "purpleprotocolprivacy.h" #include "request.h" @@ -412,7 +413,7 @@ void purple_serv_join_chat(PurpleConnection *gc, GHashTable *data) if (gc) { protocol = purple_connection_get_protocol(gc); - purple_protocol_chat_iface_join(protocol, gc, data); + purple_protocol_chat_join(PURPLE_PROTOCOL_CHAT(protocol), gc, data); } } @@ -423,7 +424,7 @@ void purple_serv_reject_chat(PurpleConnection *gc, GHashTable *data) if (gc) { protocol = purple_connection_get_protocol(gc); - purple_protocol_chat_iface_reject(protocol, gc, data); + purple_protocol_chat_reject(PURPLE_PROTOCOL_CHAT(protocol), gc, data); } } @@ -445,8 +446,10 @@ void purple_serv_chat_invite(PurpleConnection *gc, int id, const char *message, purple_signal_emit(purple_conversations_get_handle(), "chat-inviting-user", chat, name, &buffy); - if (protocol) - purple_protocol_chat_iface_invite(protocol, gc, id, buffy, name); + if(protocol) { + purple_protocol_chat_invite(PURPLE_PROTOCOL_CHAT(protocol), gc, id, + buffy, name); + } purple_signal_emit(purple_conversations_get_handle(), "chat-invited-user", chat, name, buffy); @@ -464,7 +467,7 @@ void purple_serv_chat_leave(PurpleConnection *gc, int id) PurpleProtocol *protocol; protocol = purple_connection_get_protocol(gc); - purple_protocol_chat_iface_leave(protocol, gc, id); + purple_protocol_chat_leave(PURPLE_PROTOCOL_CHAT(protocol), gc, id); } int purple_serv_chat_send(PurpleConnection *gc, int id, PurpleMessage *msg) @@ -474,8 +477,10 @@ int purple_serv_chat_send(PurpleConnection *gc, int id, PurpleMessage *msg) g_return_val_if_fail(msg != NULL, -EINVAL); - if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, CHAT, send)) - return purple_protocol_chat_iface_send(protocol, gc, id, msg); + if (PURPLE_PROTOCOL_IMPLEMENTS(protocol, CHAT, send)) { + return purple_protocol_chat_send(PURPLE_PROTOCOL_CHAT(protocol), gc, + id, msg); + } return -EINVAL; } |