Mercurial Mercurial > mcabber-isbear-patches / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refresh queue for new mcabber
authorMyhailo Danylenko <isbear@ukrpost.net>
Sat, 07 Nov 2015 17:39:49 +0200
changeset 88 0a87df8ad9c1
parent 87 78238d26911a
child 89 ce4c4447dbd4
Refresh queue for new mcabber
add-cmake.diff file | annotate | diff | comparison | revisions
add-offline-message.diff file | annotate | diff | comparison | revisions
guard-xmpp-password.diff file | annotate | diff | comparison | revisions
modularize-extcmd.diff file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
switch-to-experimental.diff file | annotate | diff | comparison | revisions 
--- a/add-cmake.diff	Wed Nov 12 23:04:36 2014 +0200
+++ b/add-cmake.diff	Sat Nov 07 17:39:49 2015 +0200
@@ -1,5 +1,6 @@
 # HG changeset patch
 # Parent 386f3b8646a61ba6af61609ff67f2da2cc70251e
+# Parent  7b70f47597432fc0b87d5a9b2a444f8c9ed97273
 Add possibility to build with CMake
 
 diff --git a/.hgignore b/.hgignore
@@ -84,7 +85,7 @@
 +pkg_check_modules ( LM REQUIRED loudmouth-1.0>=1.4.2 )
 +set ( CMAKE_REQUIRED_INCLUDES  ${LM_INCLUDE_DIRS}         )
 +set ( CMAKE_REQUIRED_LIBRARIES ${LM_LIBRARIES}            )
-+set ( CMAKE_REQUIRED_FLAGS    ${LM_LDFLAGS} ${LM_CFLAGS} )
++set ( CMAKE_REQUIRED_FLAGS     ${LM_LDFLAGS} ${LM_CFLAGS} )
 +check_symbol_exists ( lm_connection_unregister_reply_handler "loudmouth/loudmouth.h" HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER )
 +check_symbol_exists ( lm_ssl_set_cipher_list                 "loudmouth/loudmouth.h" HAVE_LM_SSL_CIPHER_LIST                     )
 +check_symbol_exists ( lm_ssl_set_ca                          "loudmouth/loudmouth.h" HAVE_LM_SSL_CA                              )
@@ -112,9 +113,9 @@
 +		# XXX just fail?
 +	endif ()
 +endif ()
-+set ( CMAKE_REQUIRED_INCLUDES  ${CURSES_INCLUDE_DIRS}             )
-+set ( CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARIES}                )
-+set ( CMAKE_REQUIRED_FLAGS     ${CURSES_LDFLAGS} ${CURSES_CFLAGS} )
++set ( CMAKE_REQUIRED_INCLUDES  ${CURSES_INCLUDE_DIRS}               )
++set ( CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARIES}                  )
++set ( CMAKE_REQUIRED_FLAGS     "${CURSES_LDFLAGS} ${CURSES_CFLAGS}" )
 +check_symbol_exists ( ESCDELAY "curses.h" HAVE_ESCDELAY )
 +
 +# Gpgme
--- a/add-offline-message.diff	Wed Nov 12 23:04:36 2014 +0200
+++ b/add-offline-message.diff	Sat Nov 07 17:39:49 2015 +0200
@@ -1,11 +1,26 @@
 # HG changeset patch
 # Parent 99ffc1bfe836f0fe094e0a9e3564521a09b39458
+# Parent  6d9f7b9e620dde7a6fda44af197260f4ae8f4b13
 Allow to specify status message, when going offline
 
-diff -r 99ffc1bfe836 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/ChangeLog.api	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/ChangeLog.api	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,3 +1,10 @@
++experimental (46)
++
++ * experimental patch add-offline-message.diff
++ * xmpp_disconnect() now accepts status message
++
++  -- Myhailo Danylenko, 2015-11-07
++
+ experimental (45)
+ 
+  * Change branch to "experimental".
+@@ -45,6 +52,13 @@
+ 
+   -- Mikael Berthe, 2015-10-04
+ 
 +experimental (44)
 +
 + * experimental patch add-offline-message.diff
@@ -16,7 +31,7 @@
  experimental (43)
  
   * Change branch to "experimental".
-@@ -80,6 +87,13 @@
+@@ -136,6 +150,13 @@
  
    -- Mikael Berthe, 2013-09-29
  
@@ -30,7 +45,7 @@
  experimental (41)
  
   * Change branch to "experimental".
-@@ -98,6 +112,13 @@
+@@ -154,6 +175,13 @@
  
    -- Mikael Berthe, 2013-04-28
  
@@ -44,7 +59,7 @@
  experimental (39)
  
   * Change branch to "experimental".
-@@ -115,6 +136,13 @@
+@@ -171,6 +199,13 @@
  
    -- Mikael Berthe, 2012-11-28
  
@@ -58,7 +73,7 @@
  experimental (37)
  
   * Change branch to "experimental".
-@@ -133,6 +161,13 @@
+@@ -189,6 +224,13 @@
  
    -- Myhailo Danylenko, 2012-10-20
  
@@ -72,18 +87,18 @@
  experimental (35)
  
   * Change branch to "experimental".
-diff -r 99ffc1bfe836 mcabber/doc/help/cs/hlp.txt
---- a/mcabber/doc/help/cs/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/cs/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/cs/hlp.txt
+--- a/mcabber/doc/help/cs/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/cs/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Zobrazí nápovědu k příkazu nebo tématu.
  
 -Dostupné příkazy jsou: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Dostupné příkazy jsou: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/cs/hlp_disconnect.txt
---- a/mcabber/doc/help/cs/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/cs/hlp_disconnect.txt
+--- a/mcabber/doc/help/cs/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -92,27 +107,27 @@
  Ukončí spojení s Jabber serverem.
 +You can specify status message to disconnect with.
  Poznámka: Seznam kontaktů (roster) je přístupný pouze v době, kdy je spojení aktivní. Po odpojení od serveru je proto prázdný.
-diff -r 99ffc1bfe836 mcabber/doc/help/cs/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/cs/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/cs/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/cs/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/de/hlp.txt
---- a/mcabber/doc/help/de/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/de/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/de/hlp.txt
+--- a/mcabber/doc/help/de/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/de/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Zeigt die Hilfe zu einem Befehl oder ein Thema an.
  Wenn kein Argument gegeben ist, wird diese Hilfe angezeigt.
 -Verfügbare Befehle: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Verfügbare Befehle: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/de/hlp_disconnect.txt
---- a/mcabber/doc/help/de/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/de/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/de/hlp_disconnect.txt
+--- a/mcabber/doc/help/de/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/de/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -121,27 +136,27 @@
  Die Verbindung zum Jabber Server trennen.
 +You can specify status message to disconnect with.
  Denke daran, dass der Roster nur verfügbar ist wenn man mit dem Jabber Server verbunden ist. Somit ist die Buddyliste auch leer, wenn man sich beim Server abmeldet.
-diff -r 99ffc1bfe836 mcabber/doc/help/de/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/de/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/de/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/de/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/en/hlp.txt
---- a/mcabber/doc/help/en/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/en/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/en/hlp.txt
+--- a/mcabber/doc/help/en/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/en/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Display some help about a command or a topic.
  If no argument provided a usage of this command is printed.
 -Available commands: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Available commands: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/en/hlp_disconnect.txt
---- a/mcabber/doc/help/en/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/en/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/en/hlp_disconnect.txt
+--- a/mcabber/doc/help/en/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/en/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -150,27 +165,27 @@
  Terminate the connection to the Jabber server.
 +You can specify status message to disconnect with.
  Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected.
-diff -r 99ffc1bfe836 mcabber/doc/help/en/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/en/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/en/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/en/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/fr/hlp.txt
---- a/mcabber/doc/help/fr/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/fr/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/fr/hlp.txt
+--- a/mcabber/doc/help/fr/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/fr/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -2,4 +2,4 @@
   /HELP [commande|+sujet]
  
  Affiche de l'aide sur la commande ou le sujet demandé.
 -Les commandes disponibles sont : add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Les commandes disponibles sont : add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/fr/hlp_disconnect.txt
---- a/mcabber/doc/help/fr/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/fr/hlp_disconnect.txt
+--- a/mcabber/doc/help/fr/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -179,27 +194,27 @@
  Ferme la connexion au serveur Jabber.
 +You can specify status message to disconnect with.
  Remarque : le roster n'est disponible que lorsque la connexion au serveur estactive, donc la liste de contacts est vide après déconnexion.
-diff -r 99ffc1bfe836 mcabber/doc/help/fr/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/fr/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/fr/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/fr/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/it/hlp.txt
---- a/mcabber/doc/help/it/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/it/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/it/hlp.txt
+--- a/mcabber/doc/help/it/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/it/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Mostra l'help relativo a comando o ad argomento.
  Se non viene specificato alcun argomento, viene visualizzato l'utilizzo del comando corrente.
 -I comandi disponibili sono: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +I comandi disponibili sono: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/it/hlp_disconnect.txt
---- a/mcabber/doc/help/it/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/it/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/it/hlp_disconnect.txt
+--- a/mcabber/doc/help/it/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/it/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -208,27 +223,27 @@
  Termina la connessione con il serve Jabber.
 +You can specify status message to disconnect with.
  Nota: il roster è disponibile soltanto quando la connessione è attiva, quindi la lista dei contatti è vuota quando si è disconnessi.
-diff -r 99ffc1bfe836 mcabber/doc/help/it/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/it/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/it/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/it/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/nl/hlp.txt
---- a/mcabber/doc/help/nl/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/nl/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/nl/hlp.txt
+--- a/mcabber/doc/help/nl/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/nl/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Toon informatie over een commando of onderwerp.
  Als geen argument is meegegeven, wordt een tekst over het gebruik van dit commando getoond.
 -Beschikbare commando's: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Beschikbare commando's: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/nl/hlp_disconnect.txt
---- a/mcabber/doc/help/nl/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/nl/hlp_disconnect.txt
+--- a/mcabber/doc/help/nl/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -237,27 +252,27 @@
  Beëindig de verbinding met de Jabber server.
 +You can specify status message to disconnect with.
  NB: het Roster is alleen beschikbaar indien er een actieve verbinding met de server bestaat. De buddylijst is dus leeg indien niet verbonden.
-diff -r 99ffc1bfe836 mcabber/doc/help/nl/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/nl/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/nl/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/nl/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/pl/hlp.txt
---- a/mcabber/doc/help/pl/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/pl/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/pl/hlp.txt
+--- a/mcabber/doc/help/pl/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/pl/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Wyświetla pomoc dotyczącą danego polecenia lub tematu.
  Jeśli nie podano żadnego argumentu, zostanie wyświetlona pomoc o sposobie użycia.
 -Dostępne polecenia: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Dostępne polecenia: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/pl/hlp_disconnect.txt
---- a/mcabber/doc/help/pl/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/pl/hlp_disconnect.txt
+--- a/mcabber/doc/help/pl/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -268,27 +283,27 @@
 \ No newline at end of file
 +You can specify status message to disconnect with.
 +Uwaga: roster dostępny jest tylko gdy połączenie do serwera jest aktywne, zatem jeżeli nie jesteś połączony lista kontaktów jest pusta.
-diff -r 99ffc1bfe836 mcabber/doc/help/pl/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/pl/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/pl/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/pl/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [message]
 +
 +Terminate all connections and exit mcabber.
 +This command is the same as /QUIT, but you can specify status message to exit with.
-diff -r 99ffc1bfe836 mcabber/doc/help/ru/hlp.txt
---- a/mcabber/doc/help/ru/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/ru/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/ru/hlp.txt
+--- a/mcabber/doc/help/ru/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/ru/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Отображает файл помощи о запрошенной команде или топике.
  Если выполнить без аргументов, будут отображены допустимые команды.
 -Допустимые команды: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Допустимые команды: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/ru/hlp_disconnect.txt
---- a/mcabber/doc/help/ru/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/ru/hlp_disconnect.txt
+--- a/mcabber/doc/help/ru/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -297,9 +312,9 @@
  Завершает соединение с Jabber-сервером.
 +Вы можете указать сообщение статуса при выходе.
  Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.
-diff -r 99ffc1bfe836 mcabber/doc/help/ru/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/ru/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/ru/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/ru/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,6 @@
 +
 + /EXIT [сообщение]
@@ -307,18 +322,18 @@
 +
 +Эта команда завершает все активные соединения и выходит из mcabber`а.
 +Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.
-diff -r 99ffc1bfe836 mcabber/doc/help/uk/hlp.txt
---- a/mcabber/doc/help/uk/hlp.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/uk/hlp.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/uk/hlp.txt
+--- a/mcabber/doc/help/uk/hlp.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/uk/hlp.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -3,4 +3,4 @@
  
  Друкує допоміжну інформацію про команду або вираз.
  Без аргументу друкує оце повідомлення.
 -Наявні команди: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
 +Наявні команди: add, alias, authorization, bind, buffer, carbons, chat_disable, clear, color, connect, del, disconnect, echo, event, exit, group, help, iline, info, module, move, msay, otr, otrpolicy, pgp, quit, rawxml, rename, request, room, roster, say_to, say, screen_refresh, set, source, status_to, status, version.
-diff -r 99ffc1bfe836 mcabber/doc/help/uk/hlp_disconnect.txt
---- a/mcabber/doc/help/uk/hlp_disconnect.txt	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/doc/help/uk/hlp_disconnect.txt
+--- a/mcabber/doc/help/uk/hlp_disconnect.txt	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -327,32 +342,32 @@
  Розірвати з'єднання з сервером.
 +Ви можете вказати повідомлення статусу відсутності.
  Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.
-diff -r 99ffc1bfe836 mcabber/doc/help/uk/hlp_exit.txt
+diff -r 6d9f7b9e620d mcabber/doc/help/uk/hlp_exit.txt
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/help/uk/hlp_exit.txt	Tue Nov 11 21:21:09 2014 +0200
++++ b/mcabber/doc/help/uk/hlp_exit.txt	Sat Nov 07 14:54:34 2015 +0200
 @@ -0,0 +1,5 @@
 +
 + /EXIT [повідомлення]
 +
 +Закриває всі з’єднання та завершує мкаббер.
 +Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.
-diff -r 99ffc1bfe836 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabber/api.h	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabber/api.h	Sat Nov 07 14:54:34 2015 +0200
 @@ -4,8 +4,8 @@
  #include <glib.h>
  #include <mcabber/config.h> // For MCABBER_BRANCH
  
--#define MCABBER_API_VERSION 43
--#define MCABBER_API_MIN     43
-+#define MCABBER_API_VERSION 44
-+#define MCABBER_API_MIN     44
+-#define MCABBER_API_VERSION 45
+-#define MCABBER_API_MIN     45
++#define MCABBER_API_VERSION 46
++#define MCABBER_API_MIN     46
  
  #define MCABBER_BRANCH_EXPERIMENTAL 1
  
-diff -r 99ffc1bfe836 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabber/commands.c	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabber/commands.c	Sat Nov 07 14:54:34 2015 +0200
 @@ -94,6 +94,7 @@
  static void do_echo(char *arg);
  static void do_module(char *arg);
@@ -369,7 +384,7 @@
    cmd_add("group", "Change group display settings",
            COMPL_GROUP, COMPL_GROUPNAME, &do_group, NULL);
    cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help, NULL);
-@@ -4170,7 +4172,9 @@
+@@ -4194,7 +4196,9 @@
  
  static void do_disconnect(char *arg)
  {
@@ -380,7 +395,7 @@
  }
  
  static void do_help(char *arg)
-@@ -4197,4 +4201,14 @@
+@@ -4221,4 +4225,14 @@
    }
  }
  
@@ -395,10 +410,10 @@
 +}
 +
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r 99ffc1bfe836 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabber/main.c	Tue Nov 11 21:21:09 2014 +0200
-@@ -91,7 +91,7 @@
+diff -r 6d9f7b9e620d mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabber/main.c	Sat Nov 07 14:54:34 2015 +0200
+@@ -89,7 +89,7 @@
  #ifndef MODULES_ENABLE
    fifo_deinit();
  #endif
@@ -407,7 +422,7 @@
    scr_terminate_curses();
  
    // Restore term settings, if needed.
-@@ -513,7 +513,7 @@
+@@ -584,7 +584,7 @@
  #ifdef HAVE_LIBOTR
    otr_terminate();
  #endif
@@ -416,10 +431,10 @@
  #ifdef HAVE_GPGME
    gpg_terminate();
  #endif
-diff -r 99ffc1bfe836 mcabber/mcabber/settings.c
---- a/mcabber/mcabber/settings.c	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabber/settings.c	Tue Nov 11 21:21:09 2014 +0200
-@@ -371,7 +371,12 @@
+diff -r 6d9f7b9e620d mcabber/mcabber/settings.c
+--- a/mcabber/mcabber/settings.c	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabber/settings.c	Sat Nov 07 14:54:34 2015 +0200
+@@ -439,7 +439,12 @@
  // - if no message is found, return NULL
  const gchar *settings_get_status_msg(enum imstatus status)
  {
@@ -433,7 +448,7 @@
  
    if (rstatus) return rstatus;
  
-@@ -396,7 +401,7 @@
+@@ -464,7 +469,7 @@
          rstatus = settings_opt_get("message_away");
          break;
  
@@ -442,10 +457,10 @@
          break;
    }
    return rstatus;
-diff -r 99ffc1bfe836 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabber/xmpp.c	Tue Nov 11 21:21:09 2014 +0200
-@@ -771,7 +771,7 @@
+diff -r 6d9f7b9e620d mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabber/xmpp.c	Sat Nov 07 14:54:34 2015 +0200
+@@ -793,7 +793,7 @@
  
  static void _try_to_reconnect(void)
  {
@@ -454,7 +469,7 @@
    if (AutoConnection)
      g_timeout_add_seconds(RECONNECTION_TIMEOUT + (random() % 90L),
                            xmpp_reconnect, NULL);
-@@ -1734,7 +1734,7 @@
+@@ -1796,7 +1796,7 @@
    LmMessageHandler *handler;
    GError *error = NULL;
  
@@ -463,7 +478,7 @@
  
    servername  = settings_opt_get("server");
    userjid     = settings_opt_get("jid");
-@@ -1915,7 +1915,7 @@
+@@ -1976,7 +1976,7 @@
    lm_message_node_set_attribute(y, "ver", ver);
  }
  
@@ -472,7 +487,7 @@
  {
    if (!lconnection)
      return;
-@@ -1923,7 +1923,7 @@
+@@ -1984,7 +1984,7 @@
      // Launch pre-disconnect internal hook
      hk_predisconnect();
      // Announce it to  everyone else
@@ -481,9 +496,9 @@
    }
    if (lm_connection_is_open(lconnection))
      lm_connection_close(lconnection, NULL);
-diff -r 99ffc1bfe836 mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabber/xmpp.h	Tue Nov 11 21:21:09 2014 +0200
+diff -r 6d9f7b9e620d mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabber/xmpp.h	Sat Nov 07 14:54:34 2015 +0200
 @@ -38,7 +38,7 @@
  
  void xmpp_init(void); /* private */
@@ -493,10 +508,10 @@
  gboolean xmpp_is_online(void);
  
  void xmpp_room_join(const char *room, const char *nickname, const char *passwd);
-diff -r 99ffc1bfe836 mcabber/mcabberrc.example
---- a/mcabber/mcabberrc.example	Tue Nov 11 21:12:47 2014 +0200
-+++ b/mcabber/mcabberrc.example	Tue Nov 11 21:21:09 2014 +0200
-@@ -371,6 +371,9 @@
+diff -r 6d9f7b9e620d mcabber/mcabberrc.example
+--- a/mcabber/mcabberrc.example	Sat Nov 07 14:37:38 2015 +0200
++++ b/mcabber/mcabberrc.example	Sat Nov 07 14:54:34 2015 +0200
+@@ -383,6 +383,9 @@
  #set message_notavail  = I'm not available
  #set message_away      = I'm away
  #
--- a/guard-xmpp-password.diff	Wed Nov 12 23:04:36 2014 +0200
+++ b/guard-xmpp-password.diff	Sat Nov 07 17:39:49 2015 +0200
@@ -1,13 +1,15 @@
+# HG changeset patch
+# Parent  43143bc6ddf39de0d04929f589a4fcfa0000b54b
 Guard XMPP password with option guard
 
   * instead of filtering access to stored in public place
     restricted data, better store restricted data somewhere else
   * add xmpp_init() and xmpp_have_password (non-api)
 
-diff -r d5d7361a99c0 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Tue Nov 11 21:10:14 2014 +0200
-+++ b/mcabber/mcabber/commands.c	Tue Nov 11 21:12:47 2014 +0200
-@@ -2286,10 +2286,8 @@
+diff -r 43143bc6ddf3 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Sat Nov 07 14:31:02 2015 +0200
++++ b/mcabber/mcabber/commands.c	Sat Nov 07 14:37:38 2015 +0200
+@@ -2303,10 +2303,8 @@
  
  static void list_option_cb(char *k, char *v, void *f)
  {
@@ -20,10 +22,10 @@
  }
  
  static void do_set(char *arg)
-diff -r d5d7361a99c0 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Tue Nov 11 21:10:14 2014 +0200
-+++ b/mcabber/mcabber/main.c	Tue Nov 11 21:12:47 2014 +0200
-@@ -389,6 +389,7 @@
+diff -r 43143bc6ddf3 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Sat Nov 07 14:31:02 2015 +0200
++++ b/mcabber/mcabber/main.c	Sat Nov 07 14:37:38 2015 +0200
+@@ -447,6 +447,7 @@
    scr_init_locale_charset();
    ut_init_debug();
    help_init();
@@ -31,20 +33,33 @@
  
    /* Parsing config file... */
    ret = cfg_read_file(configFile, TRUE);
-@@ -410,8 +411,9 @@
+@@ -468,19 +469,21 @@
  
    /* If no password is stored, we ask for it before entering
       ncurses mode -- unless the username is unknown. */
 -  if (settings_opt_get("jid") && !settings_opt_get("password")) {
 +  if (settings_opt_get("jid") && !xmpp_have_password) {
-     char *pwd = ask_password("your Jabber password");
-+    /* Will be intercepted by guard */
-     settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
-     g_free(pwd);
-   }
-diff -r d5d7361a99c0 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Tue Nov 11 21:10:14 2014 +0200
-+++ b/mcabber/mcabber/xmpp.c	Tue Nov 11 21:12:47 2014 +0200
+     const char *pass_eval = settings_opt_get("password_eval");
+     if (pass_eval) {
+       int status = 0;
+       char *pwd = password_eval(pass_eval, &status);
+       if (status == 0 && pwd) {
++        /* Will be intercepted by guard */
+         settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
+       }
+       g_free(pwd);
+     }
+     // If the password is still unset, ask the user...
+-    if (!settings_opt_get("password")) {
++    if (!xmpp_have_password) {
+       char *pwd = ask_password("your Jabber password");
++      /* Will be intercepted by guard */
+       settings_set(SETTINGS_TYPE_OPTION, "password", pwd);
+       g_free(pwd);
+     }
+diff -r 43143bc6ddf3 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Sat Nov 07 14:31:02 2015 +0200
++++ b/mcabber/mcabber/xmpp.c	Sat Nov 07 14:37:38 2015 +0200
 @@ -23,6 +23,8 @@
   */
  #include <stdlib.h>
@@ -54,7 +69,7 @@
  
  #include "xmpp.h"
  #include "xmpp_helper.h"
-@@ -54,6 +56,9 @@
+@@ -56,6 +58,9 @@
  static enum imstatus mywantedstatus = available;
  gchar *mystatusmsg;
  
@@ -64,7 +79,7 @@
  char imstatus2char[imstatus_size+1] = {
      '_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
  };
-@@ -778,16 +783,15 @@
+@@ -800,16 +805,15 @@
    GError *error = NULL;
  
    if (success) {
@@ -83,7 +98,7 @@
                                      connection_auth_cb, NULL, FALSE, &error)) {
        scr_LogPrint(LPRINT_LOGNORM, "Failed to authenticate: %s",
                     error->message);
-@@ -1687,13 +1691,37 @@
+@@ -1749,13 +1753,37 @@
    }
  }
  
@@ -120,9 +135,9 @@
 -  const char *userjid, *password, *resource, *servername, *ssl_fpr;
 +  const char *userjid, *resource, *servername, *ssl_fpr;
    char *dynresource = NULL;
-   char fpr[16];
+   char fpr[FINGERPRINT_LENGTH] = {0};
    const char *proxy_host;
-@@ -1710,7 +1738,6 @@
+@@ -1772,7 +1800,6 @@
  
    servername  = settings_opt_get("server");
    userjid     = settings_opt_get("jid");
@@ -130,7 +145,7 @@
    resource    = settings_opt_get("resource");
    proxy_host  = settings_opt_get("proxy_host");
    ssl_fpr     = settings_opt_get("ssl_fingerprint");
-@@ -1719,7 +1746,7 @@
+@@ -1781,7 +1808,7 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your JID has not been specified!");
      return -1;
    }
@@ -139,9 +154,9 @@
      scr_LogPrint(LPRINT_LOGNORM, "Your password has not been specified!");
      return -1;
    }
-diff -r d5d7361a99c0 mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h	Tue Nov 11 21:10:14 2014 +0200
-+++ b/mcabber/mcabber/xmpp.h	Tue Nov 11 21:12:47 2014 +0200
+diff -r 43143bc6ddf3 mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h	Sat Nov 07 14:31:02 2015 +0200
++++ b/mcabber/mcabber/xmpp.h	Sat Nov 07 14:37:38 2015 +0200
 @@ -34,7 +34,9 @@
  
  extern LmConnection* lconnection;
--- a/modularize-extcmd.diff	Wed Nov 12 23:04:36 2014 +0200
+++ b/modularize-extcmd.diff	Sat Nov 07 17:39:49 2015 +0200
@@ -1,8 +1,10 @@
+# HG changeset patch
+# Parent  d4d77c56d8da7c9771579efe469440eb25947271
 Convert extcmd into a module
 
-diff -r 17f90f8dc463 mcabber/configure.ac
---- a/mcabber/configure.ac	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/configure.ac	Wed Nov 12 22:25:42 2014 +0200
+diff -r d4d77c56d8da mcabber/configure.ac
+--- a/mcabber/configure.ac	Sat Nov 07 17:28:17 2015 +0200
++++ b/mcabber/configure.ac	Sat Nov 07 17:38:46 2015 +0200
 @@ -295,6 +295,7 @@
                   modules/beep/Makefile
                   modules/xttitle/Makefile
@@ -11,9 +13,9 @@
                   modules/urlregex/Makefile
                   doc/Makefile
                   doc/guide/Makefile
-diff -r 17f90f8dc463 mcabber/mcabber/Makefile.am
---- a/mcabber/mcabber/Makefile.am	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/mcabber/Makefile.am	Wed Nov 12 22:25:42 2014 +0200
+diff -r d4d77c56d8da mcabber/mcabber/Makefile.am
+--- a/mcabber/mcabber/Makefile.am	Sat Nov 07 17:28:17 2015 +0200
++++ b/mcabber/mcabber/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
 @@ -7,8 +7,7 @@
  		  xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
  		  xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
@@ -33,9 +35,9 @@
  endif
  
  #SUBDIRS =
-diff -r 17f90f8dc463 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/mcabber/hooks.c	Wed Nov 12 22:25:42 2014 +0200
+diff -r d4d77c56d8da mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c	Sat Nov 07 17:28:17 2015 +0200
++++ b/mcabber/mcabber/hooks.c	Sat Nov 07 17:38:46 2015 +0200
 @@ -36,7 +36,10 @@
  #include "utf8.h"
  #include "commands.h"
@@ -58,7 +60,7 @@
    int message_flags = 0;
    guint rtype = ROSTER_TYPE_USER;
    char *wmsg = NULL, *bmsg = NULL, *mmsg = NULL;
-@@ -399,6 +404,7 @@
+@@ -402,6 +407,7 @@
    }
  #endif
  
@@ -66,7 +68,7 @@
    if (settings_opt_get_int("events_ignore_active_window") &&
        current_buddy && scr_get_chatmode()) {
      gpointer bud = BUDDATA(current_buddy);
-@@ -417,6 +423,7 @@
+@@ -420,6 +426,7 @@
      hk_ext_cmd(bjid, EXT_CMD_TYPE_MESSAGE,
                 is_groupchat ? EXT_CMD_INFO_GROUPCHAT : EXT_CMD_INFO_RECEIVED,
                 wmsg);
@@ -74,7 +76,7 @@
  
    // Beep, if enabled:
    // - if it's a private message
-@@ -493,8 +500,10 @@
+@@ -500,8 +507,10 @@
    }
  #endif
  
@@ -85,7 +87,7 @@
  
    g_free(bmsg);
    g_free(mmsg);
-@@ -580,9 +589,11 @@
+@@ -587,9 +596,11 @@
    }
  #endif
  
@@ -97,7 +99,7 @@
  }
  
  void hk_mystatuschange(time_t timestamp, enum imstatus old_status,
-@@ -704,11 +715,13 @@
+@@ -711,11 +722,13 @@
    prev_muc_unread    = muc_unread;
    prev_muc_attention = muc_attention;
  
@@ -111,10 +113,10 @@
  }
  
  //  hk_presence_subscription_request(jid, message)
-diff -r 17f90f8dc463 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/mcabber/main.c	Wed Nov 12 22:25:42 2014 +0200
-@@ -49,9 +49,9 @@
+diff -r d4d77c56d8da mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Sat Nov 07 17:28:17 2015 +0200
++++ b/mcabber/mcabber/main.c	Sat Nov 07 17:38:46 2015 +0200
+@@ -50,9 +50,9 @@
  #include "help.h"
  #include "events.h"
  #include "compl.h"
@@ -125,7 +127,7 @@
  # include "fifo.h"
  #endif
  
-@@ -436,9 +436,11 @@
+@@ -509,9 +509,11 @@
    }
  #endif
  
@@ -137,20 +139,20 @@
  
    optstring = settings_opt_get("roster_display_filter");
    if (optstring)
-diff -r 17f90f8dc463 mcabber/modules/Makefile.am
---- a/mcabber/modules/Makefile.am	Wed Nov 12 22:24:18 2014 +0200
-+++ b/mcabber/modules/Makefile.am	Wed Nov 12 22:25:42 2014 +0200
+diff -r d4d77c56d8da mcabber/modules/Makefile.am
+--- a/mcabber/modules/Makefile.am	Sat Nov 07 17:28:17 2015 +0200
++++ b/mcabber/modules/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
 @@ -1,1 +1,1 @@
 -SUBDIRS = beep xttitle fifo urlregex
 +SUBDIRS = beep xttitle fifo eventcmd urlregex
-diff -r 17f90f8dc463 mcabber/modules/eventcmd/Makefile.am
+diff -r d4d77c56d8da mcabber/modules/eventcmd/Makefile.am
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/Makefile.am	Wed Nov 12 22:25:42 2014 +0200
++++ b/mcabber/modules/eventcmd/Makefile.am	Sat Nov 07 17:38:46 2015 +0200
 @@ -0,0 +1,13 @@
 +
 +if INSTALL_HEADERS
 +pkglib_LTLIBRARIES = libeventcmd.la
-+libeventcmd_la_SOURCES = eventcmd.c $(top_srcdir)/mcabber/extcmd.c $(top_srcdir)/mcabber/extcmd.h
++libeventcmd_la_SOURCES = eventcmd.c ../mcabber/extcmd.c ../mcabber/extcmd.h
 +libeventcmd_la_LDFLAGS = -module -avoid-version -shared
 +
 +LDADD = $(GLIB_LIBS)
@@ -160,9 +162,9 @@
 +				$(ENCHANT_CFLAGS)
 +endif
 +
-diff -r 17f90f8dc463 mcabber/modules/eventcmd/eventcmd.c
+diff -r d4d77c56d8da mcabber/modules/eventcmd/eventcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/modules/eventcmd/eventcmd.c	Wed Nov 12 22:25:42 2014 +0200
++++ b/mcabber/modules/eventcmd/eventcmd.c	Sat Nov 07 17:38:46 2015 +0200
 @@ -0,0 +1,221 @@
 +
 +/* Copyright 2009 Myhailo Danylenko
--- a/series	Wed Nov 12 23:04:36 2014 +0200
+++ b/series	Sat Nov 07 17:39:49 2015 +0200
@@ -1,6 +1,5 @@
 update-uk-translation.diff
 fix-compilation-warning.diff
-fix-changelog-api.diff
 fix-nickcolor-memleak.diff
 switch-to-experimental.diff
 separate-extcmd.diff
@@ -16,3 +15,4 @@
 move-rename-jid.diff
 templates.diff
 dynamic-layout.diff
+fix-changelog-api.diff
--- a/switch-to-experimental.diff	Wed Nov 12 23:04:36 2014 +0200
+++ b/switch-to-experimental.diff	Sat Nov 07 17:39:49 2015 +0200
@@ -1,13 +1,31 @@
+# HG changeset patch
+# Parent  b47f104be890171410d9eae72a90508a162cb836
 [local] Switch to experimental branch and api version
 
-diff -r a466d2a1ca15 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Wed Nov 12 00:15:59 2014 +0200
-+++ b/mcabber/ChangeLog.api	Wed Nov 12 00:16:06 2014 +0200
+diff -r b47f104be890 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Sat Nov 07 14:22:58 2015 +0200
++++ b/mcabber/ChangeLog.api	Sat Nov 07 14:55:06 2015 +0200
 @@ -1,3 +1,12 @@
++experimental (45)
++
++ * Change branch to "experimental".
++ * Api as defined by dev:41
++ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
++ * MQ Patch: switch-to-experimental.diff
++
++  -- Myhailo Danylenko, 2015-11-07
++
+ dev (41)
+ 
+  * Change prototype of otr_send()
+@@ -36,6 +45,15 @@
+ 
+   -- Mikael Berthe, 2015-10-04
+ 
 +experimental (43)
 +
 + * Change branch to "experimental".
-+ * Api as defined by dev:26
++ * Api as defined by dev:36
 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
 + * MQ Patch: switch-to-experimental.diff
 +
@@ -15,8 +33,8 @@
 +
  dev (36)
  
-  * process_command() does not return value
-@@ -87,6 +96,15 @@
+  * Change prototype of gpg_encrypt()
+@@ -118,6 +136,15 @@
  
    -- Mikael Berthe, 2013-09-29
  
@@ -32,7 +50,7 @@
  dev (26)
  
   * Changeset 69699ba3010f
-@@ -96,6 +114,15 @@
+@@ -127,6 +154,15 @@
  
    -- Mikael Berthe, 2013-04-28
  
@@ -48,7 +66,7 @@
  dev (25)
  
   * Stable api 0.10.2:1
-@@ -104,6 +131,15 @@
+@@ -135,6 +171,15 @@
  
    -- Mikael Berthe, 2012-11-28
  
@@ -64,7 +82,7 @@
  dev (24)
  
   * Changeset 0cb8ea02e472
-@@ -113,6 +149,15 @@
+@@ -144,6 +189,15 @@
  
    -- Myhailo Danylenko, 2012-10-20
  
@@ -80,7 +98,7 @@
  dev (23)
  
   * Changeset 8dc418af3e72
-@@ -134,6 +179,12 @@
+@@ -165,6 +219,12 @@
  
    -- Hermitifier, 2011-10-03
  
@@ -93,9 +111,9 @@
  dev (20)
  
   * Add cmd_set_safe() and cmd_is_safe()
-diff -r a466d2a1ca15 mcabber/configure.ac
---- a/mcabber/configure.ac	Wed Nov 12 00:15:59 2014 +0200
-+++ b/mcabber/configure.ac	Wed Nov 12 00:16:06 2014 +0200
+diff -r b47f104be890 mcabber/configure.ac
+--- a/mcabber/configure.ac	Sat Nov 07 14:22:58 2015 +0200
++++ b/mcabber/configure.ac	Sat Nov 07 14:55:06 2015 +0200
 @@ -284,7 +284,7 @@
  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
  
@@ -105,17 +123,17 @@
  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
  
  # We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r a466d2a1ca15 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Wed Nov 12 00:15:59 2014 +0200
-+++ b/mcabber/mcabber/api.h	Wed Nov 12 00:16:06 2014 +0200
+diff -r b47f104be890 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Sat Nov 07 14:22:58 2015 +0200
++++ b/mcabber/mcabber/api.h	Sat Nov 07 14:55:06 2015 +0200
 @@ -4,10 +4,10 @@
  #include <glib.h>
  #include <mcabber/config.h> // For MCABBER_BRANCH
  
--#define MCABBER_API_VERSION 36
--#define MCABBER_API_MIN     36
-+#define MCABBER_API_VERSION 43
-+#define MCABBER_API_MIN     43
+-#define MCABBER_API_VERSION 41
+-#define MCABBER_API_MIN     41
++#define MCABBER_API_VERSION 45
++#define MCABBER_API_MIN     45
  
 -#define MCABBER_BRANCH_DEV  1
 +#define MCABBER_BRANCH_EXPERIMENTAL 1
mcabber-isbear-patches