Completion finalizing, api fix
authorMyhailo Danylenko <isbear@ukrpost.net>
Thu, 18 Oct 2012 21:54:26 +0300
changeset 53 577410087c82
parent 52 887f44e99aa1
child 54 8688a72eb1ac
Completion finalizing, api fix * completion: * pass flags to compl_new_category * bump api * check id overflowing * add fix-api
add-offline-message.diff
completion-sorting.diff
fix-api.h
series
switch-to-experimental.diff
--- a/add-offline-message.diff	Thu Oct 18 15:36:16 2012 +0300
+++ b/add-offline-message.diff	Thu Oct 18 21:54:26 2012 +0300
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent d56e2f8b2e83dfc816f26af77fd699073a5e66c0
+# Parent 4f3a07b6b0e02c3bccc10a2157e972d9299c7dab
 Allow to specify status message, when going offline
 
-diff -r d56e2f8b2e83 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/ChangeLog.api	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/ChangeLog.api	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,3 +1,11 @@
 +
 +experimental (38)
@@ -17,7 +17,7 @@
  experimental (37)
  
   * Change branch to "experimental".
-@@ -13,6 +21,13 @@
+@@ -14,6 +22,13 @@
  
    -- Myhailo Danylenko, 2012-10-18
  
@@ -31,18 +31,18 @@
  experimental (35)
  
   * Change branch to "experimental".
-diff -r d56e2f8b2e83 mcabber/doc/help/cs/hlp.txt
---- a/mcabber/doc/help/cs/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/cs/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/cs/hlp.txt
+--- a/mcabber/doc/help/cs/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/cs/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -3,4 +3,4 @@
  
  Zobrazí nápovědu k příkazu nebo tématu.
  
 -Dostupné příkazy jsou: add, alias, authorization, bind, buffer, 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, 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 d56e2f8b2e83 mcabber/doc/help/cs/hlp_disconnect.txt
---- a/mcabber/doc/help/cs/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/cs/hlp_disconnect.txt
+--- a/mcabber/doc/help/cs/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -51,27 +51,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 d56e2f8b2e83 mcabber/doc/help/cs/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/cs/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/de/hlp.txt
---- a/mcabber/doc/help/de/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/de/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/de/hlp.txt
+--- a/mcabber/doc/help/de/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/de/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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, 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, 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 d56e2f8b2e83 mcabber/doc/help/de/hlp_disconnect.txt
---- a/mcabber/doc/help/de/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/de/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/de/hlp_disconnect.txt
+--- a/mcabber/doc/help/de/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/de/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -80,27 +80,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 d56e2f8b2e83 mcabber/doc/help/de/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/de/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/en/hlp.txt
---- a/mcabber/doc/help/en/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/en/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/en/hlp.txt
+--- a/mcabber/doc/help/en/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/en/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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, 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, 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 d56e2f8b2e83 mcabber/doc/help/en/hlp_disconnect.txt
---- a/mcabber/doc/help/en/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/en/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/en/hlp_disconnect.txt
+--- a/mcabber/doc/help/en/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/en/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -109,27 +109,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 d56e2f8b2e83 mcabber/doc/help/en/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/en/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/fr/hlp.txt
---- a/mcabber/doc/help/fr/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/fr/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/fr/hlp.txt
+--- a/mcabber/doc/help/fr/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/fr/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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, 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, 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 d56e2f8b2e83 mcabber/doc/help/fr/hlp_disconnect.txt
---- a/mcabber/doc/help/fr/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/fr/hlp_disconnect.txt
+--- a/mcabber/doc/help/fr/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -138,27 +138,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 d56e2f8b2e83 mcabber/doc/help/fr/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/fr/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/it/hlp.txt
---- a/mcabber/doc/help/it/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/it/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/it/hlp.txt
+--- a/mcabber/doc/help/it/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/it/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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, 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, 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 d56e2f8b2e83 mcabber/doc/help/it/hlp_disconnect.txt
---- a/mcabber/doc/help/it/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/it/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/it/hlp_disconnect.txt
+--- a/mcabber/doc/help/it/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/it/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -167,27 +167,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 d56e2f8b2e83 mcabber/doc/help/it/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/it/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/nl/hlp.txt
---- a/mcabber/doc/help/nl/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/nl/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/nl/hlp.txt
+--- a/mcabber/doc/help/nl/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/nl/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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, 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, 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 d56e2f8b2e83 mcabber/doc/help/nl/hlp_disconnect.txt
---- a/mcabber/doc/help/nl/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/nl/hlp_disconnect.txt
+--- a/mcabber/doc/help/nl/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -196,27 +196,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 d56e2f8b2e83 mcabber/doc/help/nl/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/nl/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/pl/hlp.txt
---- a/mcabber/doc/help/pl/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/pl/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/pl/hlp.txt
+--- a/mcabber/doc/help/pl/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/pl/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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, 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, 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 d56e2f8b2e83 mcabber/doc/help/pl/hlp_disconnect.txt
---- a/mcabber/doc/help/pl/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/pl/hlp_disconnect.txt
+--- a/mcabber/doc/help/pl/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -227,27 +227,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 d56e2f8b2e83 mcabber/doc/help/pl/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/pl/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -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 d56e2f8b2e83 mcabber/doc/help/ru/hlp.txt
---- a/mcabber/doc/help/ru/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/ru/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/ru/hlp.txt
+--- a/mcabber/doc/help/ru/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/ru/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -3,4 +3,4 @@
  
  Отображает файл помощи о запрошенной команде или топике.
  Если выполнить без аргументов, будут отображены допустимые команды.
 -Допустимые команды: add, alias, authorization, bind, buffer, 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, 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 d56e2f8b2e83 mcabber/doc/help/ru/hlp_disconnect.txt
---- a/mcabber/doc/help/ru/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/ru/hlp_disconnect.txt
+--- a/mcabber/doc/help/ru/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -256,9 +256,9 @@
  Завершает соединение с Jabber-сервером.
 +Вы можете указать сообщение статуса при выходе.
  Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.
-diff -r d56e2f8b2e83 mcabber/doc/help/ru/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/ru/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -0,0 +1,6 @@
 +
 + /EXIT [сообщение]
@@ -266,18 +266,18 @@
 +
 +Эта команда завершает все активные соединения и выходит из mcabber`а.
 +Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.
-diff -r d56e2f8b2e83 mcabber/doc/help/uk/hlp.txt
---- a/mcabber/doc/help/uk/hlp.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/uk/hlp.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/uk/hlp.txt
+--- a/mcabber/doc/help/uk/hlp.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/uk/hlp.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -3,4 +3,4 @@
  
  Друкує допоміжну інформацію про команду або вираз.
  Без аргументу друкує оце повідомлення.
 -Наявні команди: add, alias, authorization, bind, buffer, 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, 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 d56e2f8b2e83 mcabber/doc/help/uk/hlp_disconnect.txt
---- a/mcabber/doc/help/uk/hlp_disconnect.txt	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/doc/help/uk/hlp_disconnect.txt
+--- a/mcabber/doc/help/uk/hlp_disconnect.txt	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -286,20 +286,20 @@
  Розірвати з'єднання з сервером.
 +Ви можете вказати повідомлення статусу відсутності.
  Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.
-diff -r d56e2f8b2e83 mcabber/doc/help/uk/hlp_exit.txt
+diff -r 4f3a07b6b0e0 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	Thu Oct 18 13:44:57 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_exit.txt	Thu Oct 18 21:49:06 2012 +0300
 @@ -0,0 +1,5 @@
 +
 + /EXIT [повідомлення]
 +
 +Закриває всі з’єднання та завершує мкаббер.
 +Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.
-diff -r d56e2f8b2e83 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabber/api.h	Thu Oct 18 13:44:57 2012 +0300
-@@ -3,8 +3,8 @@
- 
+diff -r 4f3a07b6b0e0 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabber/api.h	Thu Oct 18 21:49:06 2012 +0300
+@@ -4,8 +4,8 @@
+ #include <glib.h>
  #include <mcabber/config.h> // For MCABBER_BRANCH
  
 -#define MCABBER_API_VERSION 37
@@ -309,9 +309,9 @@
  
  #define MCABBER_BRANCH_EXPERIMENTAL 1
  
-diff -r d56e2f8b2e83 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabber/commands.c	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabber/commands.c	Thu Oct 18 21:49:06 2012 +0300
 @@ -94,6 +94,7 @@
  static void do_otrpolicy(char *arg);
  static void do_echo(char *arg);
@@ -354,9 +354,9 @@
 +}
 +
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r d56e2f8b2e83 mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabber/main.c	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabber/main.c	Thu Oct 18 21:49:06 2012 +0300
 @@ -87,7 +87,7 @@
  #ifndef MODULES_ENABLE
    fifo_deinit();
@@ -375,9 +375,9 @@
  #ifdef HAVE_GPGME
    gpg_terminate();
  #endif
-diff -r d56e2f8b2e83 mcabber/mcabber/settings.c
---- a/mcabber/mcabber/settings.c	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabber/settings.c	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/mcabber/settings.c
+--- a/mcabber/mcabber/settings.c	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabber/settings.c	Thu Oct 18 21:49:06 2012 +0300
 @@ -372,7 +372,12 @@
  // - if no message is found, return NULL
  const gchar *settings_get_status_msg(enum imstatus status)
@@ -401,9 +401,9 @@
          break;
    }
    return rstatus;
-diff -r d56e2f8b2e83 mcabber/mcabber/xmpp.c
---- a/mcabber/mcabber/xmpp.c	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabber/xmpp.c	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/mcabber/xmpp.c
+--- a/mcabber/mcabber/xmpp.c	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabber/xmpp.c	Thu Oct 18 21:49:06 2012 +0300
 @@ -884,7 +884,7 @@
  
  static void _try_to_reconnect(void)
@@ -440,9 +440,9 @@
    }
    if (lm_connection_is_open(lconnection))
      lm_connection_close(lconnection, NULL);
-diff -r d56e2f8b2e83 mcabber/mcabber/xmpp.h
---- a/mcabber/mcabber/xmpp.h	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabber/xmpp.h	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/mcabber/xmpp.h
+--- a/mcabber/mcabber/xmpp.h	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabber/xmpp.h	Thu Oct 18 21:49:06 2012 +0300
 @@ -37,7 +37,7 @@
  
  void xmpp_init(void); /* private */
@@ -452,9 +452,9 @@
  gboolean xmpp_is_online(void);
  
  void xmpp_room_join(const char *room, const char *nickname, const char *passwd);
-diff -r d56e2f8b2e83 mcabber/mcabberrc.example
---- a/mcabber/mcabberrc.example	Thu Oct 18 13:43:18 2012 +0300
-+++ b/mcabber/mcabberrc.example	Thu Oct 18 13:44:57 2012 +0300
+diff -r 4f3a07b6b0e0 mcabber/mcabberrc.example
+--- a/mcabber/mcabberrc.example	Thu Oct 18 21:49:01 2012 +0300
++++ b/mcabber/mcabberrc.example	Thu Oct 18 21:49:06 2012 +0300
 @@ -358,6 +358,9 @@
  #set message_notavail  = I'm not available
  #set message_away      = I'm away
--- a/completion-sorting.diff	Thu Oct 18 15:36:16 2012 +0300
+++ b/completion-sorting.diff	Thu Oct 18 21:54:26 2012 +0300
@@ -1,49 +1,50 @@
 # HG changeset patch
-# Parent f8958ab545ac1af3e3fbc3b3b025de66fd1ffa51
+# Parent c6fafa6e6be9e56ad327450b2d7f01f2a8505a5e
 Make completion sorting order configurable
 
   * Use allocated plain array for categories
   * Use callbacks for dynamic completions (private for now)
   * Add compl_set_flags() to allow user to set completion order
-  * [todo] Test ordering
-  * [todo] Bump API (compatibly)
-  * [todo] Reallocate array, when need more completions
-  * [todo] Design and publish interface to dynamic completion cbs
+  * Bump api to 24-24
 
-diff -r f8958ab545ac mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/ChangeLog.api	Thu Oct 18 15:34:38 2012 +0300
-@@ -1,3 +1,9 @@
+diff -r c6fafa6e6be9 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Thu Oct 18 21:48:25 2012 +0300
++++ b/mcabber/ChangeLog.api	Thu Oct 18 21:48:47 2012 +0300
+@@ -1,3 +1,10 @@
 +dev (24)
 + * MQ patch completion-sorting.diff
-+ * Add compl_set_flags() function
++ * Change compl_add_category() to accept flags arg
++ * Define MCABBER_API_HAVE_COMPL_FLAGS
 +
 +  -- Myhailo Danylenko, 2012-10-18
 +
  dev (23)
   * Changeset 8dc418af3e72
     Add buddy_(get|set)activeresource() functions
-diff -r f8958ab545ac mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/api.h	Thu Oct 18 15:34:38 2012 +0300
-@@ -3,12 +3,13 @@
- 
+diff -r c6fafa6e6be9 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Thu Oct 18 21:48:25 2012 +0300
++++ b/mcabber/mcabber/api.h	Thu Oct 18 21:48:47 2012 +0300
+@@ -4,12 +4,15 @@
+ #include <glib.h>
  #include <mcabber/config.h> // For MCABBER_BRANCH
  
 -#define MCABBER_API_VERSION 23
+-#define MCABBER_API_MIN     21
 +#define MCABBER_API_VERSION 24
- #define MCABBER_API_MIN     21
++#define MCABBER_API_MIN     24
  
  #define MCABBER_BRANCH_DEV  1
  
++// cmd_add returns gpointer id
  #define MCABBER_API_HAVE_CMD_ID 1
++// compl_new_category accepts flags argument
 +#define MCABBER_API_HAVE_COMPL_FLAGS 1
  
  extern const gchar *mcabber_branch;
  extern const guint mcabber_api_version;
-diff -r f8958ab545ac mcabber/mcabber/compl.c
---- a/mcabber/mcabber/compl.c	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/compl.c	Thu Oct 18 15:34:38 2012 +0300
+diff -r c6fafa6e6be9 mcabber/mcabber/compl.c
+--- a/mcabber/mcabber/compl.c	Thu Oct 18 21:48:25 2012 +0300
++++ b/mcabber/mcabber/compl.c	Thu Oct 18 21:48:47 2012 +0300
 @@ -2,7 +2,7 @@
   * compl.c      -- Completion system
   *
@@ -53,7 +54,7 @@
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
-@@ -47,49 +47,97 @@
+@@ -47,82 +47,148 @@
    GSList *next;         // pointer to next completion to try
  } compl;
  
@@ -175,13 +176,16 @@
 +  register_builtin_cat(COMPL_MODULE, NULL);
  }
  
+-//  compl_new_category()
 +#ifdef MODULES_ENABLE
- //  compl_new_category()
++//  compl_new_category(flags)
  // Reserves id for new completion category.
++// Flags determine word sorting order.
  // Returns 0, if no more categories can be allocated.
-@@ -97,32 +145,87 @@
- // as it is likely to change in future.
- guint compl_new_category(void)
+-// Note, that user should not make any assumptions about id nature,
+-// as it is likely to change in future.
+-guint compl_new_category(void)
++guint compl_new_category(guint flags)
  {
 -  const guint maxcat = 8 * sizeof (registered_cats);
    guint i = 0;
@@ -193,27 +197,21 @@
 -    guint64 id = 1 << i;
 -    registered_cats |= id;
 -    return i+1;
-+  for (; i < num_categories; i++) {
-+    if (!(Categories[i].flags & COMPL_CAT_ACTIVE)) {
-+      Categories[i].flags = COMPL_CAT_ACTIVE;
-+      Categories[i].words = NULL;
-+      return i+1;
++  for (; i < num_categories; i++)
++    if (!(Categories[i].flags & COMPL_CAT_ACTIVE))
++      break;
++  if (i >= num_categories ) {
++    if (num_categories > G_MAXUINT - 16) {
++      scr_log_print(LPRINT_LOGNORM, "Warning: Too many "
++                    "completion categories!");
++      return 0;
 +    }
++    num_categories += 16;
++    Categories = g_renew(category, Categories, num_categories);
    }
-+  {
-+    guint new_num = num_categories + 16; // *2?
-+    category *new_categories = g_try_renew(category, Categories, new_num);
-+    if (new_categories) {
-+      Categories     = new_categories;
-+      num_categories = new_num;
-+      Categories[i].flags = COMPL_CAT_ACTIVE;
-+      Categories[i].words = NULL;
-+      return i+1;
-+    } else
-+      scr_log_print(LPRINT_LOGNORM, "Warning: Unable to reallocate "
-+                    "more memory for completion categories!");
-+  }
-+  return 0;
++  Categories[i].flags = COMPL_CAT_ACTIVE | (flags & COMPL_CAT_USERFLAGS);
++  Categories[i].words = NULL;
++  return i+1;
  }
  
  //  compl_del_category(id)
@@ -249,40 +247,10 @@
 +  for (wel = Categories[compl].words; wel; wel = g_slist_next (wel))
 +    g_free (wel -> data);
 +  g_slist_free (Categories[compl].words);
-+}
-+
-+//  compl_set_flags (category, flags)
-+// Sets sorting order for given category.
-+// In future can be merged with new_category, set more flags,
-+// maybe even set dynamic callback.
-+void compl_set_flags(guint compl, guint new_flags)
-+{
-+  if (!compl) {
-+    scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                "Invalid category.");
-+    return;
-+  }
-+
-+  compl--;
-+
-+  if (compl < num_categories) {
-+    guint flags = Categories[compl].flags;
-+    if (flags & COMPL_CAT_BUILTIN)
-+      scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                  "Rejecting builtin category.");
-+    else if (!(flags & COMPL_CAT_ACTIVE))
-+      scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                  "Not existing category.");
-+    else
-+      Categories[compl].flags = (flags & ~COMPL_CAT_USERFLAGS) |
-+                                (new_flags & COMPL_CAT_USERFLAGS);
-+  } else
-+    scr_log_print(LPRINT_DEBUG, "Error: compl_set_flags() - "
-+                                "Not existing category.");
  }
  #endif
  
-@@ -136,12 +239,15 @@
+@@ -136,12 +202,15 @@
  guint new_completion(const char *prefix, GSList *compl_cat, const gchar *suffix)
  {
    compl *c;
@@ -299,7 +267,7 @@
    }
  
    if (settings_opt_get_int("completion_ignore_case"))
-@@ -160,14 +266,15 @@
+@@ -160,14 +229,15 @@
            compval = g_strdup_printf("%s%s", word+len, suffix);
          else
            compval = g_strdup(word+len);
@@ -319,7 +287,7 @@
  }
  
  //  done_completion();
-@@ -222,35 +329,46 @@
+@@ -222,35 +292,46 @@
  
  /* Categories functions */
  
@@ -335,12 +303,12 @@
 +
 +static gint compl_sort_append(gconstpointer a, gconstpointer b)
 +{
-+  return 1; // XXX
++  return 1;
 +}
 +
 +static gint compl_sort_prepend(gconstpointer a, gconstpointer b)
 +{
-+  return -1; // XXX
++  return -1;
 +}
 +
  //  compl_add_category_word(categ, command)
@@ -383,7 +351,7 @@
  
    // If word is not space-terminated, we add one trailing space
    for (nword = (char*)word; *nword; nword++)
-@@ -262,59 +380,64 @@
+@@ -262,59 +343,64 @@
      nword = g_strdup(word);
    }
  
@@ -477,7 +445,7 @@
  }
  
  //  compl_get_category_list()
-@@ -323,48 +446,28 @@
+@@ -323,48 +409,28 @@
  // whole list after use.
  GSList *compl_get_category_list(guint categ, guint *dynlist)
  {
@@ -540,10 +508,10 @@
  }
  
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
-diff -r f8958ab545ac mcabber/mcabber/compl.h
---- a/mcabber/mcabber/compl.h	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/compl.h	Thu Oct 18 15:34:38 2012 +0300
-@@ -28,10 +28,17 @@
+diff -r c6fafa6e6be9 mcabber/mcabber/compl.h
+--- a/mcabber/mcabber/compl.h	Thu Oct 18 21:48:25 2012 +0300
++++ b/mcabber/mcabber/compl.h	Thu Oct 18 21:48:47 2012 +0300
+@@ -28,9 +28,15 @@
  #define COMPL_OTRPOLICY   21
  #define COMPL_MODULE      22
  
@@ -551,20 +519,19 @@
 +
  #ifdef MODULES_ENABLE
 -void  compl_init_system(void);
+-guint compl_new_category(void);
 +#define COMPL_FLAGS_SORT     0x00
 +#define COMPL_FLAGS_REVERSE  0x10
 +#define COMPL_FLAGS_APPEND   0x20
 +#define COMPL_FLAGS_PREPEND  0x30
 +
- guint compl_new_category(void);
++guint compl_new_category(guint flags);
  void  compl_del_category(guint id);
-+void  compl_set_flags(guint id, guint flags);
  #endif
  
- void    compl_add_category_word(guint categ, const gchar *command);
-diff -r f8958ab545ac mcabber/mcabber/main.c
---- a/mcabber/mcabber/main.c	Mon Oct 15 19:53:02 2012 +0200
-+++ b/mcabber/mcabber/main.c	Thu Oct 18 15:34:38 2012 +0300
+diff -r c6fafa6e6be9 mcabber/mcabber/main.c
+--- a/mcabber/mcabber/main.c	Thu Oct 18 21:48:25 2012 +0300
++++ b/mcabber/mcabber/main.c	Thu Oct 18 21:48:47 2012 +0300
 @@ -364,13 +364,13 @@
    }
  
@@ -580,3 +547,15 @@
    modules_init();
  #endif
    /* Initialize charset */
+diff -r c6fafa6e6be9 mcabber/modules/beep/beep.c
+--- a/mcabber/modules/beep/beep.c	Thu Oct 18 21:48:25 2012 +0300
++++ b/mcabber/modules/beep/beep.c	Thu Oct 18 21:48:47 2012 +0300
+@@ -89,7 +89,7 @@
+ static void beep_init(void)
+ {
+   /* Create completions */
+-  beep_cid = compl_new_category();
++  beep_cid = compl_new_category(COMPL_FLAGS_SORT);
+   if (beep_cid) {
+     compl_add_category_word(beep_cid, "enable");
+     compl_add_category_word(beep_cid, "disable");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-api.h	Thu Oct 18 21:54:26 2012 +0300
@@ -0,0 +1,15 @@
+# HG changeset patch
+# Parent f8958ab545ac1af3e3fbc3b3b025de66fd1ffa51
+api.h should include glib header
+
+diff -r f8958ab545ac -r c6fafa6e6be9 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Mon Oct 15 19:53:02 2012 +0200
++++ b/mcabber/mcabber/api.h	Thu Oct 18 21:48:25 2012 +0300
+@@ -1,6 +1,7 @@
+ #ifndef __MCABBER_API_H__
+ #define __MCABBER_API_H__ 1
+ 
++#include <glib.h>
+ #include <mcabber/config.h> // For MCABBER_BRANCH
+ 
+ #define MCABBER_API_VERSION 23
--- a/series	Thu Oct 18 15:36:16 2012 +0300
+++ b/series	Thu Oct 18 21:54:26 2012 +0300
@@ -1,3 +1,4 @@
+fix-api.h
 completion-sorting.diff
 fix-date-fill.diff
 switch-to-experimental.diff
--- a/switch-to-experimental.diff	Thu Oct 18 15:36:16 2012 +0300
+++ b/switch-to-experimental.diff	Thu Oct 18 21:54:26 2012 +0300
@@ -1,9 +1,9 @@
 [local] Switch to experimental branch and api version
 
-diff -r 5f699ebd8af1 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Thu Oct 18 13:39:25 2012 +0300
-+++ b/mcabber/ChangeLog.api	Thu Oct 18 13:43:08 2012 +0300
-@@ -1,9 +1,27 @@
+diff -r 84ad372d8137 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Thu Oct 18 21:48:49 2012 +0300
++++ b/mcabber/ChangeLog.api	Thu Oct 18 21:48:54 2012 +0300
+@@ -1,3 +1,12 @@
 +experimental (37)
 +
 + * Change branch to "experimental".
@@ -15,7 +15,8 @@
 +
  dev (24)
   * MQ patch completion-sorting.diff
-  * Add compl_set_flags() function
+  * Change compl_add_category() to accept flags arg
+@@ -5,6 +14,15 @@
  
    -- Myhailo Danylenko, 2012-10-18
  
@@ -31,7 +32,7 @@
  dev (23)
   * Changeset 8dc418af3e72
     Add buddy_(get|set)activeresource() functions
-@@ -22,6 +40,12 @@
+@@ -23,6 +41,12 @@
  
    -- Hermitifier, 2011-10-03
  
@@ -44,9 +45,9 @@
  dev (20)
  
   * Add cmd_set_safe() and cmd_is_safe()
-diff -r 5f699ebd8af1 mcabber/configure.ac
---- a/mcabber/configure.ac	Thu Oct 18 13:39:25 2012 +0300
-+++ b/mcabber/configure.ac	Thu Oct 18 13:43:08 2012 +0300
+diff -r 84ad372d8137 mcabber/configure.ac
+--- a/mcabber/configure.ac	Thu Oct 18 21:48:49 2012 +0300
++++ b/mcabber/configure.ac	Thu Oct 18 21:48:54 2012 +0300
 @@ -272,7 +272,7 @@
  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
  
@@ -56,20 +57,20 @@
  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
  
  # We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r 5f699ebd8af1 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Thu Oct 18 13:39:25 2012 +0300
-+++ b/mcabber/mcabber/api.h	Thu Oct 18 13:43:08 2012 +0300
-@@ -3,10 +3,10 @@
- 
+diff -r 84ad372d8137 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Thu Oct 18 21:48:49 2012 +0300
++++ b/mcabber/mcabber/api.h	Thu Oct 18 21:48:54 2012 +0300
+@@ -4,10 +4,10 @@
+ #include <glib.h>
  #include <mcabber/config.h> // For MCABBER_BRANCH
  
 -#define MCABBER_API_VERSION 24
--#define MCABBER_API_MIN     21
+-#define MCABBER_API_MIN     24
 +#define MCABBER_API_VERSION 37
 +#define MCABBER_API_MIN     37
  
 -#define MCABBER_BRANCH_DEV  1
 +#define MCABBER_BRANCH_EXPERIMENTAL 1
  
+ // cmd_add returns gpointer id
  #define MCABBER_API_HAVE_CMD_ID 1
- #define MCABBER_API_HAVE_COMPL_FLAGS 1