Update patch a bit
authorMyhailo Danylenko <isbear@ukrpost.net>
Wed, 01 Aug 2012 03:56:52 +0300
changeset 39 b108657f3fb5
parent 38 dfd761c2ef62
child 40 9a0de2a8d877
Update patch a bit
add-offline-message.diff
--- a/add-offline-message.diff	Wed Aug 01 00:22:13 2012 +0300
+++ b/add-offline-message.diff	Wed Aug 01 03:56:52 2012 +0300
@@ -3,7 +3,7 @@
 
 diff -r 26edaf6ea10b mcabber/ChangeLog.api
 --- a/mcabber/ChangeLog.api	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/ChangeLog.api	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/ChangeLog.api	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,3 +1,9 @@
 +dev (24)
 + * experimental patch add-offline-message
@@ -14,9 +14,18 @@
  dev (23)
   * Changeset 8dc418af3e72
     Add buddy_(get|set)activeresource() functions
+diff -r 26edaf6ea10b mcabber/doc/help/cs/hlp.txt
+--- a/mcabber/doc/help/cs/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/cs/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/cs/hlp_disconnect.txt
 --- a/mcabber/doc/help/cs/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -27,16 +36,25 @@
  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 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/cs/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/de/hlp.txt
+--- a/mcabber/doc/help/de/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/de/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/de/hlp_disconnect.txt
 --- a/mcabber/doc/help/de/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/de/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/de/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -47,16 +65,25 @@
  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 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/de/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/en/hlp.txt
+--- a/mcabber/doc/help/en/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/en/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/en/hlp_disconnect.txt
 --- a/mcabber/doc/help/en/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/en/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/en/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -67,16 +94,25 @@
  Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected.
 diff -r 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/en/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/fr/hlp.txt
+--- a/mcabber/doc/help/fr/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/fr/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/fr/hlp_disconnect.txt
 --- a/mcabber/doc/help/fr/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -87,16 +123,25 @@
  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 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/fr/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/it/hlp.txt
+--- a/mcabber/doc/help/it/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/it/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/it/hlp_disconnect.txt
 --- a/mcabber/doc/help/it/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/it/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/it/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -107,16 +152,25 @@
  Nota: il roster è disponibile soltanto quando la connessione è attiva, quindi la lista dei contatti è vuota quando si è disconnessi.
 diff -r 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/it/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/nl/hlp.txt
+--- a/mcabber/doc/help/nl/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/nl/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/nl/hlp_disconnect.txt
 --- a/mcabber/doc/help/nl/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -127,16 +181,25 @@
  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 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/nl/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/pl/hlp.txt
+--- a/mcabber/doc/help/pl/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/pl/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/pl/hlp_disconnect.txt
 --- a/mcabber/doc/help/pl/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -149,16 +212,25 @@
 +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 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/pl/hlp_exit.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/ru/hlp.txt
+--- a/mcabber/doc/help/ru/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/ru/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/ru/hlp_disconnect.txt
 --- a/mcabber/doc/help/ru/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -169,16 +241,26 @@
  Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.
 diff -r 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
-@@ -0,0 +1,5 @@
++++ b/mcabber/doc/help/ru/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
+@@ -0,0 +1,6 @@
++
++ /EXIT [сообщение]
++
 +
-+ /EXIT [message]
-+
-+Terminate all connections and exit mcabber.
-+This command is the same as /QUIT, but you can specify status message to exit with.
++Эта команда завершает все активные соединения и выходит из mcabber`а.
++Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.
+diff -r 26edaf6ea10b mcabber/doc/help/uk/hlp.txt
+--- a/mcabber/doc/help/uk/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
++++ b/mcabber/doc/help/uk/hlp.txt	Wed Aug 01 03:56:16 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 26edaf6ea10b mcabber/doc/help/uk/hlp_disconnect.txt
 --- a/mcabber/doc/help/uk/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -1,5 +1,6 @@
  
 - /DISCONNECT
@@ -189,16 +271,16 @@
  Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.
 diff -r 26edaf6ea10b 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	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
 @@ -0,0 +1,5 @@
 +
-+ /EXIT [message]
++ /EXIT [повідомлення]
 +
-+Terminate all connections and exit mcabber.
-+This command is the same as /QUIT, but you can specify status message to exit with.
++Закриває всі з’єднання та завершує мкаббер.
++Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.
 diff -r 26edaf6ea10b mcabber/mcabber/api.h
 --- a/mcabber/mcabber/api.h	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/mcabber/api.h	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/mcabber/api.h	Wed Aug 01 03:56:16 2012 +0300
 @@ -3,8 +3,8 @@
  
  #include <mcabber/config.h> // For MCABBER_BRANCH
@@ -212,7 +294,7 @@
  
 diff -r 26edaf6ea10b mcabber/mcabber/commands.c
 --- a/mcabber/mcabber/commands.c	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/mcabber/commands.c	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/mcabber/commands.c	Wed Aug 01 03:56:16 2012 +0300
 @@ -94,6 +94,7 @@
  static void do_otrpolicy(char *arg);
  static void do_echo(char *arg);
@@ -229,26 +311,24 @@
    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);
-@@ -4120,7 +4122,11 @@
+@@ -4120,7 +4122,9 @@
  
  static void do_disconnect(char *arg)
  {
 -  xmpp_disconnect();
-+  char *message = NULL;
-+  if (arg)
-+    message = to_utf8(arg);
++  char *message = to_utf8(arg);
 +  xmpp_disconnect(message);
 +  g_free(message);
  }
  
  static void do_help(char *arg)
-@@ -4134,4 +4140,14 @@
+@@ -4134,4 +4138,14 @@
      scr_print_logwindow(arg);
  }
  
 +static void do_exit(char *arg)
 +{
-+  if (arg && xmpp_is_online()) { // XXX should we always disconnect?
++  if (arg) {
 +    char *message = to_utf8(arg);
 +    xmpp_disconnect(message);
 +    g_free(message);
@@ -259,7 +339,7 @@
  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
 diff -r 26edaf6ea10b mcabber/mcabber/main.c
 --- a/mcabber/mcabber/main.c	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/mcabber/main.c	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/mcabber/main.c	Wed Aug 01 03:56:16 2012 +0300
 @@ -83,7 +83,7 @@
  #ifndef MODULES_ENABLE
    fifo_deinit();
@@ -280,7 +360,7 @@
  #endif
 diff -r 26edaf6ea10b mcabber/mcabber/xmpp.c
 --- a/mcabber/mcabber/xmpp.c	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/mcabber/xmpp.c	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/mcabber/xmpp.c	Wed Aug 01 03:56:16 2012 +0300
 @@ -892,7 +892,7 @@
  
  static void _try_to_reconnect(void)
@@ -319,7 +399,7 @@
      lm_connection_close(lconnection, NULL);
 diff -r 26edaf6ea10b mcabber/mcabber/xmpp.h
 --- a/mcabber/mcabber/xmpp.h	Mon Jul 30 22:39:17 2012 +0200
-+++ b/mcabber/mcabber/xmpp.h	Wed Aug 01 00:21:32 2012 +0300
++++ b/mcabber/mcabber/xmpp.h	Wed Aug 01 03:56:16 2012 +0300
 @@ -35,7 +35,7 @@
  extern LmSSL* lssl;