aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-04-04 23:43:41 +01:00
commit e9eb9fc3a9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/command/command.c
View File

@ -1211,6 +1211,7 @@ static struct cmd_t command_defs[] =
{ "on|off", "Override the global message setting for the current chat room." },
{ "mention on|off", "Override the global 'mention' setting for the current chat room." },
{ "trigger on|off", "Override the global 'trigger' setting for the current chat room." },
{ "reset", "Reset to global notification settings for the current chat room." },
{ "remind <seconds>", "Notification reminder period for unread messages, use 0 to disable." },
{ "typing on|off", "Notifications when contacts are typing." },
{ "typing current on|off", "Whether typing notifications are triggered for the current window." },

8
src/xmpp/iq.c
View File

@ -1611,7 +1611,7 @@ _room_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata
{
const char *type = xmpp_stanza_get_type(stanza);
ProfRoomInfoData *cb_data = (ProfRoomInfoData *)userdata;
log_info("Received diso#info response for room: %s", cb_data->room);
log_info("Received disco#info response for room: %s", cb_data->room);
// handle error responses
if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) {
@ -1747,9 +1747,9 @@ _disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdat
const char *type = xmpp_stanza_get_type(stanza);
if (from) {
log_info("Received diso#info response from: %s", from);
log_info("Received disco#info response from: %s", from);
} else {
log_info("Received diso#info response");
log_info("Received disco#info response");
}
// handle error responses
@ -1820,7 +1820,7 @@ _disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdat
static void
_disco_items_result_handler(xmpp_stanza_t *const stanza)
{
log_debug("Received diso#items response");
log_debug("Received disco#items response");
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
GSList *items = NULL;

2
src/xmpp/presence.c
View File

@ -576,7 +576,7 @@ _handle_caps(char *jid, XMPPCaps *caps)
iq_send_caps_request_legacy(jid, id, caps->node, caps->ver);
free(id);
} else {
log_info("No hash specified: %s, could not create ver string, not sending service disovery request.", jid);
log_info("No hash specified: %s, could not create ver string, not sending service discovery request.", jid);
}
}