Skip to content
This repository was archived by the owner on Mar 18, 2025. It is now read-only.

Commit 28fb8df

Browse files
committed
Minor adjustments to error messages.
1 parent 43a7dea commit 28fb8df

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

groups.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ signald_get_group_member_name(SignaldAccount *sa, JsonNode *node)
8080
return (char *)json_node_get_string(node);
8181
} else {
8282
JsonObject *member = json_node_get_object(node);
83-
8483
return (char *)json_object_get_string_member(member, "number");
8584
}
8685
}
@@ -199,7 +198,6 @@ signald_add_group(SignaldAccount *sa, const char *groupId, const char *groupName
199198

200199
if (group != NULL) {
201200
// Belt and suspenders check to make sure we don't join the same group twice.
202-
203201
return;
204202
}
205203

@@ -535,7 +533,7 @@ signald_join_chat(PurpleConnection *pc, GHashTable *data)
535533
json_object_set_string_member(message, "groupName", name);
536534

537535
if (! signald_send_json(sa, message)) {
538-
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write subscription message."));
536+
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not send message for joining group."));
539537
}
540538

541539
// Once the above send completes we'll get a "group_created" event that'll
@@ -563,7 +561,7 @@ signald_chat_leave(PurpleConnection *pc, int id)
563561
json_object_set_string_member(message, "recipientGroupId", groupId);
564562

565563
if (! signald_send_json(sa, message)) {
566-
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write subscription message."));
564+
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not send message for leaving group."));
567565
}
568566

569567
json_object_unref(message);
@@ -589,7 +587,7 @@ signald_chat_rename(PurpleConnection *pc, PurpleChat *chat)
589587
json_object_set_string_member(data, "groupName", chat->alias);
590588

591589
if (! signald_send_json(sa, data)) {
592-
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write subscription message."));
590+
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write message for renaming group."));
593591
}
594592

595593
signald_rename_group(sa, groupId, chat->alias);
@@ -619,7 +617,7 @@ signald_chat_invite(PurpleConnection *pc, int id, const char *message, const cha
619617
json_object_set_array_member(data, "members", members);
620618

621619
if (! signald_send_json(sa, data)) {
622-
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write subscription message."));
620+
purple_connection_error(sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write message for inviting contacts to group."));
623621
}
624622

625623
json_object_unref(data);
@@ -662,7 +660,7 @@ GHashTable
662660
void
663661
signald_set_chat_topic(PurpleConnection *pc, int id, const char *topic)
664662
{
665-
// Nothing to do here. For some reason this callback has to be
663+
// Nothing to do here. For some reason this callback has to be
666664
// registered if Pidgin is going to enable the "Alias..." menu
667665
// option in the conversation.
668666
}

libsignald.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ signald_close (PurpleConnection *pc)
497497
json_object_set_string_member(data, "username", purple_account_get_username(sa->account));
498498

499499
if (!signald_send_json (sa, data)) {
500-
purple_connection_error (sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write subscription message."));
500+
purple_connection_error (sa->pc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Could not write message for unsubscribing."));
501501
}
502502

503503
purple_input_remove(sa->watcher);

0 commit comments

Comments
 (0)