--- a/libpurple/protocols/zephyr/zephyr.c Sun Jan 24 18:55:47 2021 -0600
+++ b/libpurple/protocols/zephyr/zephyr.c Sun Jan 24 18:55:53 2021 -0600
@@ -2132,33 +2132,36 @@
-static unsigned int zephyr_send_typing(PurpleProtocolIM *im, PurpleConnection *gc, const char *who, PurpleIMTypingState state) {
+zephyr_send_typing(G_GNUC_UNUSED PurpleProtocolIM *im, PurpleConnection *gc, const char *who, PurpleIMTypingState state) + zephyr_account *zephyr; - zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
+ if (state == PURPLE_IM_NOT_TYPING) {
- if (state == PURPLE_IM_NOT_TYPING)
+ zephyr = purple_connection_get_protocol_data(gc); /* XXX We probably should care if this fails. Or maybe we don't want to */
purple_debug_info("zephyr", "who is null\n");
- recipient = local_zephyr_normalize(zephyr,"");
+ recipient = local_zephyr_normalize(zephyr, ""); char *comma = strrchr(who, ',');
/* Don't ping broadcast (chat) recipients */
/* The strrchr case finds a realm-stripped broadcast subscription
e.g. comma is the last character in the string */
- if (comma && ( (*(comma+1) == '\0') || (*(comma+1) == '@')))
+ if (comma && ((*(comma+1) == '\0') || (*(comma+1) == '@'))) {
- recipient = local_zephyr_normalize(zephyr,who);
+ recipient = local_zephyr_normalize(zephyr, who); - purple_debug_info("zephyr","about to send typing notification to %s\n",recipient);
- zephyr_send_message(zephyr,"MESSAGE","PERSONAL",recipient,"","","PING");
- purple_debug_info("zephyr","sent typing notification\n");
+ purple_debug_info("zephyr", "about to send typing notification to %s", recipient); + zephyr_send_message(zephyr, "MESSAGE", "PERSONAL", recipient, "", "", "PING"); + purple_debug_info("zephyr", "sent typing notification\n"); * TODO: Is this correct? It means we will call