--- a/add-offline-message.diff Wed Aug 08 14:33:16 2012 +0300
+++ b/add-offline-message.diff Wed Aug 08 21:11:04 2012 +0300
@@ -4,7 +4,7 @@
diff -r 4401d3c453d3 mcabber/ChangeLog.api
--- a/mcabber/ChangeLog.api Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/ChangeLog.api Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/ChangeLog.api Wed Aug 08 21:10:23 2012 +0300
@@ -1,3 +1,10 @@
+
+experimental (36)
@@ -18,7 +18,7 @@
diff -r 4401d3c453d3 mcabber/doc/help/cs/hlp.txt
--- a/mcabber/doc/help/cs/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/cs/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/cs/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Zobrazí nápovědu k příkazu nebo tématu.
@@ -27,7 +27,7 @@
+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 4401d3c453d3 mcabber/doc/help/cs/hlp_disconnect.txt
--- a/mcabber/doc/help/cs/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/cs/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/cs/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -38,7 +38,7 @@
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 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/cs/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -47,7 +47,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/de/hlp.txt
--- a/mcabber/doc/help/de/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/de/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/de/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Zeigt die Hilfe zu einem Befehl oder ein Thema an.
@@ -56,7 +56,7 @@
+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 4401d3c453d3 mcabber/doc/help/de/hlp_disconnect.txt
--- a/mcabber/doc/help/de/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/de/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/de/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -67,7 +67,7 @@
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 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/de/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -76,7 +76,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/en/hlp.txt
--- a/mcabber/doc/help/en/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/en/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/en/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Display some help about a command or a topic.
@@ -85,7 +85,7 @@
+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 4401d3c453d3 mcabber/doc/help/en/hlp_disconnect.txt
--- a/mcabber/doc/help/en/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/en/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/en/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -96,7 +96,7 @@
Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected.
diff -r 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/en/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -105,7 +105,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/fr/hlp.txt
--- a/mcabber/doc/help/fr/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/fr/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/fr/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -2,4 +2,4 @@
/HELP [commande|+sujet]
@@ -114,7 +114,7 @@
+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 4401d3c453d3 mcabber/doc/help/fr/hlp_disconnect.txt
--- a/mcabber/doc/help/fr/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/fr/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/fr/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -125,7 +125,7 @@
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 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/fr/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -134,7 +134,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/it/hlp.txt
--- a/mcabber/doc/help/it/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/it/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/it/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Mostra l'help relativo a comando o ad argomento.
@@ -143,7 +143,7 @@
+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 4401d3c453d3 mcabber/doc/help/it/hlp_disconnect.txt
--- a/mcabber/doc/help/it/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/it/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/it/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -154,7 +154,7 @@
Nota: il roster è disponibile soltanto quando la connessione è attiva, quindi la lista dei contatti è vuota quando si è disconnessi.
diff -r 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/it/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -163,7 +163,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/nl/hlp.txt
--- a/mcabber/doc/help/nl/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/nl/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/nl/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Toon informatie over een commando of onderwerp.
@@ -172,7 +172,7 @@
+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 4401d3c453d3 mcabber/doc/help/nl/hlp_disconnect.txt
--- a/mcabber/doc/help/nl/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/nl/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/nl/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -183,7 +183,7 @@
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 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/nl/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -192,7 +192,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/pl/hlp.txt
--- a/mcabber/doc/help/pl/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/pl/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/pl/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Wyświetla pomoc dotyczącą danego polecenia lub tematu.
@@ -201,7 +201,7 @@
+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 4401d3c453d3 mcabber/doc/help/pl/hlp_disconnect.txt
--- a/mcabber/doc/help/pl/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/pl/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/pl/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -214,7 +214,7 @@
+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 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/pl/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [message]
@@ -223,7 +223,7 @@
+This command is the same as /QUIT, but you can specify status message to exit with.
diff -r 4401d3c453d3 mcabber/doc/help/ru/hlp.txt
--- a/mcabber/doc/help/ru/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/ru/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/ru/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Отображает файл помощи о запрошенной команде или топике.
@@ -232,7 +232,7 @@
+Допустимые команды: 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 4401d3c453d3 mcabber/doc/help/ru/hlp_disconnect.txt
--- a/mcabber/doc/help/ru/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/ru/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/ru/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -243,7 +243,7 @@
Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.
diff -r 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/ru/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,6 @@
+
+ /EXIT [сообщение]
@@ -253,7 +253,7 @@
+Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.
diff -r 4401d3c453d3 mcabber/doc/help/uk/hlp.txt
--- a/mcabber/doc/help/uk/hlp.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/uk/hlp.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/uk/hlp.txt Wed Aug 08 21:10:23 2012 +0300
@@ -3,4 +3,4 @@
Друкує допоміжну інформацію про команду або вираз.
@@ -262,7 +262,7 @@
+Наявні команди: 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 4401d3c453d3 mcabber/doc/help/uk/hlp_disconnect.txt
--- a/mcabber/doc/help/uk/hlp_disconnect.txt Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/doc/help/uk/hlp_disconnect.txt Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_disconnect.txt Wed Aug 08 21:10:23 2012 +0300
@@ -1,5 +1,6 @@
- /DISCONNECT
@@ -273,7 +273,7 @@
Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.
diff -r 4401d3c453d3 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 08 14:32:45 2012 +0300
++++ b/mcabber/doc/help/uk/hlp_exit.txt Wed Aug 08 21:10:23 2012 +0300
@@ -0,0 +1,5 @@
+
+ /EXIT [повідомлення]
@@ -282,7 +282,7 @@
+Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.
diff -r 4401d3c453d3 mcabber/mcabber/api.h
--- a/mcabber/mcabber/api.h Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/mcabber/api.h Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/mcabber/api.h Wed Aug 08 21:10:23 2012 +0300
@@ -3,8 +3,8 @@
#include <mcabber/config.h> // For MCABBER_BRANCH
@@ -296,7 +296,7 @@
diff -r 4401d3c453d3 mcabber/mcabber/commands.c
--- a/mcabber/mcabber/commands.c Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/mcabber/commands.c Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/mcabber/commands.c Wed Aug 08 21:10:23 2012 +0300
@@ -94,6 +94,7 @@
static void do_otrpolicy(char *arg);
static void do_echo(char *arg);
@@ -332,7 +332,7 @@
+{
+ if (arg) {
+ char *message = to_utf8(arg);
-+ xmpp_disconnect(message);
++ settings_opt_set("message_exit", message);
+ g_free(message);
+ }
+ mcabber_set_terminate_ui();
@@ -341,7 +341,7 @@
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
diff -r 4401d3c453d3 mcabber/mcabber/main.c
--- a/mcabber/mcabber/main.c Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/mcabber/main.c Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/mcabber/main.c Wed Aug 08 21:10:23 2012 +0300
@@ -87,7 +87,7 @@
#ifndef MODULES_ENABLE
fifo_deinit();
@@ -356,13 +356,24 @@
otr_terminate();
#endif
- xmpp_disconnect();
-+ xmpp_disconnect(NULL);
++ xmpp_disconnect(settings_opt_get("message_exit"));
#ifdef HAVE_GPGME
gpg_terminate();
#endif
+diff -r 4401d3c453d3 mcabber/mcabber/settings.c
+--- a/mcabber/mcabber/settings.c Wed Aug 08 14:31:24 2012 +0300
++++ b/mcabber/mcabber/settings.c Wed Aug 08 21:10:23 2012 +0300
+@@ -398,6 +398,7 @@
+ break;
+
+ default: // offline, invisible
++ rstatus = settings_opt_get("message_offline");
+ break;
+ }
+ return rstatus;
diff -r 4401d3c453d3 mcabber/mcabber/xmpp.c
--- a/mcabber/mcabber/xmpp.c Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/mcabber/xmpp.c Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/mcabber/xmpp.c Wed Aug 08 21:10:23 2012 +0300
@@ -885,7 +885,7 @@
static void _try_to_reconnect(void)
@@ -401,7 +412,7 @@
lm_connection_close(lconnection, NULL);
diff -r 4401d3c453d3 mcabber/mcabber/xmpp.h
--- a/mcabber/mcabber/xmpp.h Wed Aug 08 14:31:24 2012 +0300
-+++ b/mcabber/mcabber/xmpp.h Wed Aug 08 14:32:45 2012 +0300
++++ b/mcabber/mcabber/xmpp.h Wed Aug 08 21:10:23 2012 +0300
@@ -37,7 +37,7 @@
void xmpp_init(void); /* private */
@@ -411,3 +422,22 @@
gboolean xmpp_is_online(void);
void xmpp_room_join(const char *room, const char *nickname, const char *passwd);
+diff -r 4401d3c453d3 mcabber/mcabberrc.example
+--- a/mcabber/mcabberrc.example Wed Aug 08 14:31:24 2012 +0300
++++ b/mcabber/mcabberrc.example Wed Aug 08 21:10:23 2012 +0300
+@@ -357,11 +357,15 @@
+ #set message_dnd = Please do not disturb
+ #set message_notavail = I'm not available
+ #set message_away = I'm away
++#set message_offline = I'm offline
+ #
+ # The auto-away message is only used when 'autoaway' is set. The previous
+ # message will be restored when leaving auto-away status. If this message
+ # isn't defined, the status message will stay unchanged.
+ set message_autoaway = Auto-away (idle)
++#
++# Exit message will be set as offline status when exiting mcabber.
++#set message_exit = Bye!
+
+ # Escape timeout delay (ESCDELAY)
+ # The ESCDELAY variable specifies the time, in milliseconds, for which