Merge branch 'master' into ci/cygwin-build

Author: ritesh006

docs/profanity.1

@@ -182,6 +182,14 @@ The roster is your contact list. By default displayed at the right side on the c
 .TP
 .BR XEP
 XMPP is an extendable protocol. There are core features and optional features described in XMPP Extension Protocols, short XEPs.
+.PP
+There are various kind of messages.
+.TP
+1:1 messages are regular messages from one party to another party, from one JID to the other JID. Often you have the other party added to your roster.
+.TP
+MUC messages are messages from one party to a group chat.
+.TP
+MUC PM (MUC private message) are messages from one party to another party which are in the same group chat. You might not have the JID of this person in your roster or don't know their JID at all. Communication is done over the MUC via the nick. Only the two parties can see the message. In the Android client Conversations this is displayed as "whispering". If a user leaves a MUC another user can join the MUC with the same nick unless the nick is registered. Which often isn't the case.
 .SH SEE ALSO
 .B Profanity
 itself has a lot of built\-in help. Check the

src/tools/bookmark_ignore.h

@@ -36,7 +36,7 @@
 #ifndef BOOKMARK_IGNORE_H
 #define BOOKMARK_IGNORE_H
 
-void bookmark_ignore_on_connect();
+void bookmark_ignore_on_connect(const char* const barejid);
 void bookmark_ignore_on_disconnect();
 gboolean bookmark_ignored(Bookmark* bookmark);
 gchar** bookmark_ignore_list(gsize* len);

src/ui/ui.h

@@ -288,7 +288,7 @@ void cons_show_disco_info(const char* from, GSList* identities, GSList* features
 
 void cons_show_disco_contact_information(GHashTable* addresses);
 
-void cons_show_qrcode();
+void cons_show_qrcode(const char* const text);
 
 void cons_show_room_invite(const char* const invitor, const char* const room, const char* const reason);
 void cons_check_version(gboolean not_available_msg);