add-offline-message.diff
changeset 43 e0cda680d7a8
parent 39 b108657f3fb5
child 44 0e723147f836
equal deleted inserted replaced
42:0ee5e9903fa1 43:e0cda680d7a8
     1 # HG changeset patch
     1 # HG changeset patch
     2 # Parent 26edaf6ea10b8db2ed07da3e4ad9bee03077de84
     2 # Parent 4401d3c453d3716b2c780db6c0aab3ccf04b33e7
       
     3 Allow to specify status message, when going offline
     3 
     4 
     4 diff -r 26edaf6ea10b mcabber/ChangeLog.api
     5 diff -r 4401d3c453d3 mcabber/ChangeLog.api
     5 --- a/mcabber/ChangeLog.api	Mon Jul 30 22:39:17 2012 +0200
     6 --- a/mcabber/ChangeLog.api	Wed Aug 08 14:31:24 2012 +0300
     6 +++ b/mcabber/ChangeLog.api	Wed Aug 01 03:56:16 2012 +0300
     7 +++ b/mcabber/ChangeLog.api	Wed Aug 08 14:32:45 2012 +0300
     7 @@ -1,3 +1,9 @@
     8 @@ -1,3 +1,10 @@
     8 +dev (24)
     9 +
       
    10 +experimental (36)
       
    11 +
     9 + * experimental patch add-offline-message
    12 + * experimental patch add-offline-message
    10 + * xmpp_disconnect now accepts status message
    13 + * xmpp_disconnect now accepts status message
    11 +
    14 +
    12 +  -- Myhailo Danylenko, 2012-07-31
    15 +  -- Myhailo Danylenko, 2012-07-31
    13 +
    16  
    14  dev (23)
    17  experimental (35)
    15   * Changeset 8dc418af3e72
    18  
    16     Add buddy_(get|set)activeresource() functions
    19 diff -r 4401d3c453d3 mcabber/doc/help/cs/hlp.txt
    17 diff -r 26edaf6ea10b mcabber/doc/help/cs/hlp.txt
    20 --- a/mcabber/doc/help/cs/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
    18 --- a/mcabber/doc/help/cs/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
    21 +++ b/mcabber/doc/help/cs/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
    19 +++ b/mcabber/doc/help/cs/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
       
    20 @@ -3,4 +3,4 @@
    22 @@ -3,4 +3,4 @@
    21  
    23  
    22  Zobrazí nápovědu k příkazu nebo tématu.
    24  Zobrazí nápovědu k příkazu nebo tématu.
    23  
    25  
    24 -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.
    26 -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.
    25 +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.
    27 +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.
    26 diff -r 26edaf6ea10b mcabber/doc/help/cs/hlp_disconnect.txt
    28 diff -r 4401d3c453d3 mcabber/doc/help/cs/hlp_disconnect.txt
    27 --- a/mcabber/doc/help/cs/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
    29 --- a/mcabber/doc/help/cs/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
    28 +++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
    30 +++ b/mcabber/doc/help/cs/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
    29 @@ -1,5 +1,6 @@
    31 @@ -1,5 +1,6 @@
    30  
    32  
    31 - /DISCONNECT
    33 - /DISCONNECT
    32 + /DISCONNECT [message]
    34 + /DISCONNECT [message]
    33  
    35  
    34  Ukončí spojení s Jabber serverem.
    36  Ukončí spojení s Jabber serverem.
    35 +You can specify status message to disconnect with.
    37 +You can specify status message to disconnect with.
    36  Poznámka: Seznam kontaktů (roster) je přístupný pouze v době, kdy je spojení aktivní. Po odpojení od serveru je proto prázdný.
    38  Poznámka: Seznam kontaktů (roster) je přístupný pouze v době, kdy je spojení aktivní. Po odpojení od serveru je proto prázdný.
    37 diff -r 26edaf6ea10b mcabber/doc/help/cs/hlp_exit.txt
    39 diff -r 4401d3c453d3 mcabber/doc/help/cs/hlp_exit.txt
    38 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39 +++ b/mcabber/doc/help/cs/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
    41 +++ b/mcabber/doc/help/cs/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
    40 @@ -0,0 +1,5 @@
    42 @@ -0,0 +1,5 @@
    41 +
    43 +
    42 + /EXIT [message]
    44 + /EXIT [message]
    43 +
    45 +
    44 +Terminate all connections and exit mcabber.
    46 +Terminate all connections and exit mcabber.
    45 +This command is the same as /QUIT, but you can specify status message to exit with.
    47 +This command is the same as /QUIT, but you can specify status message to exit with.
    46 diff -r 26edaf6ea10b mcabber/doc/help/de/hlp.txt
    48 diff -r 4401d3c453d3 mcabber/doc/help/de/hlp.txt
    47 --- a/mcabber/doc/help/de/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
    49 --- a/mcabber/doc/help/de/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
    48 +++ b/mcabber/doc/help/de/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
    50 +++ b/mcabber/doc/help/de/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
    49 @@ -3,4 +3,4 @@
    51 @@ -3,4 +3,4 @@
    50  
    52  
    51  Zeigt die Hilfe zu einem Befehl oder ein Thema an.
    53  Zeigt die Hilfe zu einem Befehl oder ein Thema an.
    52  Wenn kein Argument gegeben ist, wird diese Hilfe angezeigt.
    54  Wenn kein Argument gegeben ist, wird diese Hilfe angezeigt.
    53 -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.
    55 -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.
    54 +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.
    56 +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.
    55 diff -r 26edaf6ea10b mcabber/doc/help/de/hlp_disconnect.txt
    57 diff -r 4401d3c453d3 mcabber/doc/help/de/hlp_disconnect.txt
    56 --- a/mcabber/doc/help/de/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
    58 --- a/mcabber/doc/help/de/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
    57 +++ b/mcabber/doc/help/de/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
    59 +++ b/mcabber/doc/help/de/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
    58 @@ -1,5 +1,6 @@
    60 @@ -1,5 +1,6 @@
    59  
    61  
    60 - /DISCONNECT
    62 - /DISCONNECT
    61 + /DISCONNECT [message]
    63 + /DISCONNECT [message]
    62  
    64  
    63  Die Verbindung zum Jabber Server trennen.
    65  Die Verbindung zum Jabber Server trennen.
    64 +You can specify status message to disconnect with.
    66 +You can specify status message to disconnect with.
    65  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.
    67  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.
    66 diff -r 26edaf6ea10b mcabber/doc/help/de/hlp_exit.txt
    68 diff -r 4401d3c453d3 mcabber/doc/help/de/hlp_exit.txt
    67 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    69 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    68 +++ b/mcabber/doc/help/de/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
    70 +++ b/mcabber/doc/help/de/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
    69 @@ -0,0 +1,5 @@
    71 @@ -0,0 +1,5 @@
    70 +
    72 +
    71 + /EXIT [message]
    73 + /EXIT [message]
    72 +
    74 +
    73 +Terminate all connections and exit mcabber.
    75 +Terminate all connections and exit mcabber.
    74 +This command is the same as /QUIT, but you can specify status message to exit with.
    76 +This command is the same as /QUIT, but you can specify status message to exit with.
    75 diff -r 26edaf6ea10b mcabber/doc/help/en/hlp.txt
    77 diff -r 4401d3c453d3 mcabber/doc/help/en/hlp.txt
    76 --- a/mcabber/doc/help/en/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
    78 --- a/mcabber/doc/help/en/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
    77 +++ b/mcabber/doc/help/en/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
    79 +++ b/mcabber/doc/help/en/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
    78 @@ -3,4 +3,4 @@
    80 @@ -3,4 +3,4 @@
    79  
    81  
    80  Display some help about a command or a topic.
    82  Display some help about a command or a topic.
    81  If no argument provided a usage of this command is printed.
    83  If no argument provided a usage of this command is printed.
    82 -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.
    84 -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.
    83 +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.
    85 +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.
    84 diff -r 26edaf6ea10b mcabber/doc/help/en/hlp_disconnect.txt
    86 diff -r 4401d3c453d3 mcabber/doc/help/en/hlp_disconnect.txt
    85 --- a/mcabber/doc/help/en/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
    87 --- a/mcabber/doc/help/en/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
    86 +++ b/mcabber/doc/help/en/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
    88 +++ b/mcabber/doc/help/en/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
    87 @@ -1,5 +1,6 @@
    89 @@ -1,5 +1,6 @@
    88  
    90  
    89 - /DISCONNECT
    91 - /DISCONNECT
    90 + /DISCONNECT [message]
    92 + /DISCONNECT [message]
    91  
    93  
    92  Terminate the connection to the Jabber server.
    94  Terminate the connection to the Jabber server.
    93 +You can specify status message to disconnect with.
    95 +You can specify status message to disconnect with.
    94  Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected.
    96  Note: the roster is only available when the connection to the server is active, so the buddylist is empty when disconnected.
    95 diff -r 26edaf6ea10b mcabber/doc/help/en/hlp_exit.txt
    97 diff -r 4401d3c453d3 mcabber/doc/help/en/hlp_exit.txt
    96 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    98 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    97 +++ b/mcabber/doc/help/en/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
    99 +++ b/mcabber/doc/help/en/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
    98 @@ -0,0 +1,5 @@
   100 @@ -0,0 +1,5 @@
    99 +
   101 +
   100 + /EXIT [message]
   102 + /EXIT [message]
   101 +
   103 +
   102 +Terminate all connections and exit mcabber.
   104 +Terminate all connections and exit mcabber.
   103 +This command is the same as /QUIT, but you can specify status message to exit with.
   105 +This command is the same as /QUIT, but you can specify status message to exit with.
   104 diff -r 26edaf6ea10b mcabber/doc/help/fr/hlp.txt
   106 diff -r 4401d3c453d3 mcabber/doc/help/fr/hlp.txt
   105 --- a/mcabber/doc/help/fr/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
   107 --- a/mcabber/doc/help/fr/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
   106 +++ b/mcabber/doc/help/fr/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
   108 +++ b/mcabber/doc/help/fr/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
   107 @@ -2,4 +2,4 @@
   109 @@ -2,4 +2,4 @@
   108   /HELP [commande|+sujet]
   110   /HELP [commande|+sujet]
   109  
   111  
   110  Affiche de l'aide sur la commande ou le sujet demandé.
   112  Affiche de l'aide sur la commande ou le sujet demandé.
   111 -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.
   113 -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.
   112 +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.
   114 +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.
   113 diff -r 26edaf6ea10b mcabber/doc/help/fr/hlp_disconnect.txt
   115 diff -r 4401d3c453d3 mcabber/doc/help/fr/hlp_disconnect.txt
   114 --- a/mcabber/doc/help/fr/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
   116 --- a/mcabber/doc/help/fr/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
   115 +++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
   117 +++ b/mcabber/doc/help/fr/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
   116 @@ -1,5 +1,6 @@
   118 @@ -1,5 +1,6 @@
   117  
   119  
   118 - /DISCONNECT
   120 - /DISCONNECT
   119 + /DISCONNECT [message]
   121 + /DISCONNECT [message]
   120  
   122  
   121  Ferme la connexion au serveur Jabber.
   123  Ferme la connexion au serveur Jabber.
   122 +You can specify status message to disconnect with.
   124 +You can specify status message to disconnect with.
   123  Remarque : le roster n'est disponible que lorsque la connexion au serveur estactive, donc la liste de contacts est vide après déconnexion.
   125  Remarque : le roster n'est disponible que lorsque la connexion au serveur estactive, donc la liste de contacts est vide après déconnexion.
   124 diff -r 26edaf6ea10b mcabber/doc/help/fr/hlp_exit.txt
   126 diff -r 4401d3c453d3 mcabber/doc/help/fr/hlp_exit.txt
   125 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   127 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   126 +++ b/mcabber/doc/help/fr/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
   128 +++ b/mcabber/doc/help/fr/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
   127 @@ -0,0 +1,5 @@
   129 @@ -0,0 +1,5 @@
   128 +
   130 +
   129 + /EXIT [message]
   131 + /EXIT [message]
   130 +
   132 +
   131 +Terminate all connections and exit mcabber.
   133 +Terminate all connections and exit mcabber.
   132 +This command is the same as /QUIT, but you can specify status message to exit with.
   134 +This command is the same as /QUIT, but you can specify status message to exit with.
   133 diff -r 26edaf6ea10b mcabber/doc/help/it/hlp.txt
   135 diff -r 4401d3c453d3 mcabber/doc/help/it/hlp.txt
   134 --- a/mcabber/doc/help/it/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
   136 --- a/mcabber/doc/help/it/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
   135 +++ b/mcabber/doc/help/it/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
   137 +++ b/mcabber/doc/help/it/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
   136 @@ -3,4 +3,4 @@
   138 @@ -3,4 +3,4 @@
   137  
   139  
   138  Mostra l'help relativo a comando o ad argomento.
   140  Mostra l'help relativo a comando o ad argomento.
   139  Se non viene specificato alcun argomento, viene visualizzato l'utilizzo del comando corrente.
   141  Se non viene specificato alcun argomento, viene visualizzato l'utilizzo del comando corrente.
   140 -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.
   142 -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.
   141 +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.
   143 +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.
   142 diff -r 26edaf6ea10b mcabber/doc/help/it/hlp_disconnect.txt
   144 diff -r 4401d3c453d3 mcabber/doc/help/it/hlp_disconnect.txt
   143 --- a/mcabber/doc/help/it/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
   145 --- a/mcabber/doc/help/it/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
   144 +++ b/mcabber/doc/help/it/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
   146 +++ b/mcabber/doc/help/it/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
   145 @@ -1,5 +1,6 @@
   147 @@ -1,5 +1,6 @@
   146  
   148  
   147 - /DISCONNECT
   149 - /DISCONNECT
   148 + /DISCONNECT [message]
   150 + /DISCONNECT [message]
   149  
   151  
   150  Termina la connessione con il serve Jabber.
   152  Termina la connessione con il serve Jabber.
   151 +You can specify status message to disconnect with.
   153 +You can specify status message to disconnect with.
   152  Nota: il roster è disponibile soltanto quando la connessione è attiva, quindi la lista dei contatti è vuota quando si è disconnessi.
   154  Nota: il roster è disponibile soltanto quando la connessione è attiva, quindi la lista dei contatti è vuota quando si è disconnessi.
   153 diff -r 26edaf6ea10b mcabber/doc/help/it/hlp_exit.txt
   155 diff -r 4401d3c453d3 mcabber/doc/help/it/hlp_exit.txt
   154 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   156 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   155 +++ b/mcabber/doc/help/it/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
   157 +++ b/mcabber/doc/help/it/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
   156 @@ -0,0 +1,5 @@
   158 @@ -0,0 +1,5 @@
   157 +
   159 +
   158 + /EXIT [message]
   160 + /EXIT [message]
   159 +
   161 +
   160 +Terminate all connections and exit mcabber.
   162 +Terminate all connections and exit mcabber.
   161 +This command is the same as /QUIT, but you can specify status message to exit with.
   163 +This command is the same as /QUIT, but you can specify status message to exit with.
   162 diff -r 26edaf6ea10b mcabber/doc/help/nl/hlp.txt
   164 diff -r 4401d3c453d3 mcabber/doc/help/nl/hlp.txt
   163 --- a/mcabber/doc/help/nl/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
   165 --- a/mcabber/doc/help/nl/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
   164 +++ b/mcabber/doc/help/nl/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
   166 +++ b/mcabber/doc/help/nl/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
   165 @@ -3,4 +3,4 @@
   167 @@ -3,4 +3,4 @@
   166  
   168  
   167  Toon informatie over een commando of onderwerp.
   169  Toon informatie over een commando of onderwerp.
   168  Als geen argument is meegegeven, wordt een tekst over het gebruik van dit commando getoond.
   170  Als geen argument is meegegeven, wordt een tekst over het gebruik van dit commando getoond.
   169 -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.
   171 -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.
   170 +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.
   172 +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.
   171 diff -r 26edaf6ea10b mcabber/doc/help/nl/hlp_disconnect.txt
   173 diff -r 4401d3c453d3 mcabber/doc/help/nl/hlp_disconnect.txt
   172 --- a/mcabber/doc/help/nl/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
   174 --- a/mcabber/doc/help/nl/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
   173 +++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
   175 +++ b/mcabber/doc/help/nl/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
   174 @@ -1,5 +1,6 @@
   176 @@ -1,5 +1,6 @@
   175  
   177  
   176 - /DISCONNECT
   178 - /DISCONNECT
   177 + /DISCONNECT [message]
   179 + /DISCONNECT [message]
   178  
   180  
   179  Beëindig de verbinding met de Jabber server.
   181  Beëindig de verbinding met de Jabber server.
   180 +You can specify status message to disconnect with.
   182 +You can specify status message to disconnect with.
   181  NB: het Roster is alleen beschikbaar indien er een actieve verbinding met de server bestaat. De buddylijst is dus leeg indien niet verbonden.
   183  NB: het Roster is alleen beschikbaar indien er een actieve verbinding met de server bestaat. De buddylijst is dus leeg indien niet verbonden.
   182 diff -r 26edaf6ea10b mcabber/doc/help/nl/hlp_exit.txt
   184 diff -r 4401d3c453d3 mcabber/doc/help/nl/hlp_exit.txt
   183 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   185 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   184 +++ b/mcabber/doc/help/nl/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
   186 +++ b/mcabber/doc/help/nl/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
   185 @@ -0,0 +1,5 @@
   187 @@ -0,0 +1,5 @@
   186 +
   188 +
   187 + /EXIT [message]
   189 + /EXIT [message]
   188 +
   190 +
   189 +Terminate all connections and exit mcabber.
   191 +Terminate all connections and exit mcabber.
   190 +This command is the same as /QUIT, but you can specify status message to exit with.
   192 +This command is the same as /QUIT, but you can specify status message to exit with.
   191 diff -r 26edaf6ea10b mcabber/doc/help/pl/hlp.txt
   193 diff -r 4401d3c453d3 mcabber/doc/help/pl/hlp.txt
   192 --- a/mcabber/doc/help/pl/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
   194 --- a/mcabber/doc/help/pl/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
   193 +++ b/mcabber/doc/help/pl/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
   195 +++ b/mcabber/doc/help/pl/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
   194 @@ -3,4 +3,4 @@
   196 @@ -3,4 +3,4 @@
   195  
   197  
   196  Wyświetla pomoc dotyczącą danego polecenia lub tematu.
   198  Wyświetla pomoc dotyczącą danego polecenia lub tematu.
   197  Jeśli nie podano żadnego argumentu, zostanie wyświetlona pomoc o sposobie użycia.
   199  Jeśli nie podano żadnego argumentu, zostanie wyświetlona pomoc o sposobie użycia.
   198 -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.
   200 -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.
   199 +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.
   201 +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.
   200 diff -r 26edaf6ea10b mcabber/doc/help/pl/hlp_disconnect.txt
   202 diff -r 4401d3c453d3 mcabber/doc/help/pl/hlp_disconnect.txt
   201 --- a/mcabber/doc/help/pl/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
   203 --- a/mcabber/doc/help/pl/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
   202 +++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
   204 +++ b/mcabber/doc/help/pl/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
   203 @@ -1,5 +1,6 @@
   205 @@ -1,5 +1,6 @@
   204  
   206  
   205 - /DISCONNECT
   207 - /DISCONNECT
   206 + /DISCONNECT [message]
   208 + /DISCONNECT [message]
   207  
   209  
   208  Przerywa połączenie z serwerem Jabbera.
   210  Przerywa połączenie z serwerem Jabbera.
   209 -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.
   211 -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.
   210 \ No newline at end of file
   212 \ No newline at end of file
   211 +You can specify status message to disconnect with.
   213 +You can specify status message to disconnect with.
   212 +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.
   214 +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.
   213 diff -r 26edaf6ea10b mcabber/doc/help/pl/hlp_exit.txt
   215 diff -r 4401d3c453d3 mcabber/doc/help/pl/hlp_exit.txt
   214 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   216 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   215 +++ b/mcabber/doc/help/pl/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
   217 +++ b/mcabber/doc/help/pl/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
   216 @@ -0,0 +1,5 @@
   218 @@ -0,0 +1,5 @@
   217 +
   219 +
   218 + /EXIT [message]
   220 + /EXIT [message]
   219 +
   221 +
   220 +Terminate all connections and exit mcabber.
   222 +Terminate all connections and exit mcabber.
   221 +This command is the same as /QUIT, but you can specify status message to exit with.
   223 +This command is the same as /QUIT, but you can specify status message to exit with.
   222 diff -r 26edaf6ea10b mcabber/doc/help/ru/hlp.txt
   224 diff -r 4401d3c453d3 mcabber/doc/help/ru/hlp.txt
   223 --- a/mcabber/doc/help/ru/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
   225 --- a/mcabber/doc/help/ru/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
   224 +++ b/mcabber/doc/help/ru/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
   226 +++ b/mcabber/doc/help/ru/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
   225 @@ -3,4 +3,4 @@
   227 @@ -3,4 +3,4 @@
   226  
   228  
   227  Отображает файл помощи о запрошенной команде или топике.
   229  Отображает файл помощи о запрошенной команде или топике.
   228  Если выполнить без аргументов, будут отображены допустимые команды.
   230  Если выполнить без аргументов, будут отображены допустимые команды.
   229 -Допустимые команды: 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.
   231 -Допустимые команды: 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.
   230 +Допустимые команды: 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.
   232 +Допустимые команды: 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.
   231 diff -r 26edaf6ea10b mcabber/doc/help/ru/hlp_disconnect.txt
   233 diff -r 4401d3c453d3 mcabber/doc/help/ru/hlp_disconnect.txt
   232 --- a/mcabber/doc/help/ru/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
   234 --- a/mcabber/doc/help/ru/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
   233 +++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
   235 +++ b/mcabber/doc/help/ru/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
   234 @@ -1,5 +1,6 @@
   236 @@ -1,5 +1,6 @@
   235  
   237  
   236 - /DISCONNECT
   238 - /DISCONNECT
   237 + /DISCONNECT [сообщение]
   239 + /DISCONNECT [сообщение]
   238  
   240  
   239  Завершает соединение с Jabber-сервером.
   241  Завершает соединение с Jabber-сервером.
   240 +Вы можете указать сообщение статуса при выходе.
   242 +Вы можете указать сообщение статуса при выходе.
   241  Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.
   243  Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.
   242 diff -r 26edaf6ea10b mcabber/doc/help/ru/hlp_exit.txt
   244 diff -r 4401d3c453d3 mcabber/doc/help/ru/hlp_exit.txt
   243 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   245 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   244 +++ b/mcabber/doc/help/ru/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
   246 +++ b/mcabber/doc/help/ru/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
   245 @@ -0,0 +1,6 @@
   247 @@ -0,0 +1,6 @@
   246 +
   248 +
   247 + /EXIT [сообщение]
   249 + /EXIT [сообщение]
   248 +
   250 +
   249 +
   251 +
   250 +Эта команда завершает все активные соединения и выходит из mcabber`а.
   252 +Эта команда завершает все активные соединения и выходит из mcabber`а.
   251 +Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.
   253 +Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.
   252 diff -r 26edaf6ea10b mcabber/doc/help/uk/hlp.txt
   254 diff -r 4401d3c453d3 mcabber/doc/help/uk/hlp.txt
   253 --- a/mcabber/doc/help/uk/hlp.txt	Mon Jul 30 22:39:17 2012 +0200
   255 --- a/mcabber/doc/help/uk/hlp.txt	Wed Aug 08 14:31:24 2012 +0300
   254 +++ b/mcabber/doc/help/uk/hlp.txt	Wed Aug 01 03:56:16 2012 +0300
   256 +++ b/mcabber/doc/help/uk/hlp.txt	Wed Aug 08 14:32:45 2012 +0300
   255 @@ -3,4 +3,4 @@
   257 @@ -3,4 +3,4 @@
   256  
   258  
   257  Друкує допоміжну інформацію про команду або вираз.
   259  Друкує допоміжну інформацію про команду або вираз.
   258  Без аргументу друкує оце повідомлення.
   260  Без аргументу друкує оце повідомлення.
   259 -Наявні команди: 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.
   261 -Наявні команди: 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.
   260 +Наявні команди: 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.
   262 +Наявні команди: 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.
   261 diff -r 26edaf6ea10b mcabber/doc/help/uk/hlp_disconnect.txt
   263 diff -r 4401d3c453d3 mcabber/doc/help/uk/hlp_disconnect.txt
   262 --- a/mcabber/doc/help/uk/hlp_disconnect.txt	Mon Jul 30 22:39:17 2012 +0200
   264 --- a/mcabber/doc/help/uk/hlp_disconnect.txt	Wed Aug 08 14:31:24 2012 +0300
   263 +++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Wed Aug 01 03:56:16 2012 +0300
   265 +++ b/mcabber/doc/help/uk/hlp_disconnect.txt	Wed Aug 08 14:32:45 2012 +0300
   264 @@ -1,5 +1,6 @@
   266 @@ -1,5 +1,6 @@
   265  
   267  
   266 - /DISCONNECT
   268 - /DISCONNECT
   267 + /DISCONNECT [повідомлення]
   269 + /DISCONNECT [повідомлення]
   268  
   270  
   269  Розірвати з'єднання з сервером.
   271  Розірвати з'єднання з сервером.
   270 +Ви можете вказати повідомлення статусу відсутності.
   272 +Ви можете вказати повідомлення статусу відсутності.
   271  Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.
   273  Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.
   272 diff -r 26edaf6ea10b mcabber/doc/help/uk/hlp_exit.txt
   274 diff -r 4401d3c453d3 mcabber/doc/help/uk/hlp_exit.txt
   273 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   275 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   274 +++ b/mcabber/doc/help/uk/hlp_exit.txt	Wed Aug 01 03:56:16 2012 +0300
   276 +++ b/mcabber/doc/help/uk/hlp_exit.txt	Wed Aug 08 14:32:45 2012 +0300
   275 @@ -0,0 +1,5 @@
   277 @@ -0,0 +1,5 @@
   276 +
   278 +
   277 + /EXIT [повідомлення]
   279 + /EXIT [повідомлення]
   278 +
   280 +
   279 +Закриває всі з’єднання та завершує мкаббер.
   281 +Закриває всі з’єднання та завершує мкаббер.
   280 +Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.
   282 +Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.
   281 diff -r 26edaf6ea10b mcabber/mcabber/api.h
   283 diff -r 4401d3c453d3 mcabber/mcabber/api.h
   282 --- a/mcabber/mcabber/api.h	Mon Jul 30 22:39:17 2012 +0200
   284 --- a/mcabber/mcabber/api.h	Wed Aug 08 14:31:24 2012 +0300
   283 +++ b/mcabber/mcabber/api.h	Wed Aug 01 03:56:16 2012 +0300
   285 +++ b/mcabber/mcabber/api.h	Wed Aug 08 14:32:45 2012 +0300
   284 @@ -3,8 +3,8 @@
   286 @@ -3,8 +3,8 @@
   285  
   287  
   286  #include <mcabber/config.h> // For MCABBER_BRANCH
   288  #include <mcabber/config.h> // For MCABBER_BRANCH
   287  
   289  
   288 -#define MCABBER_API_VERSION 23
   290 -#define MCABBER_API_VERSION 35
   289 -#define MCABBER_API_MIN     21
   291 -#define MCABBER_API_MIN     35
   290 +#define MCABBER_API_VERSION 24
   292 +#define MCABBER_API_VERSION 36
   291 +#define MCABBER_API_MIN     24
   293 +#define MCABBER_API_MIN     36
   292  
   294  
   293  #define MCABBER_BRANCH_DEV  1
   295  #define MCABBER_BRANCH_EXPERIMENTAL  1
   294  
   296  
   295 diff -r 26edaf6ea10b mcabber/mcabber/commands.c
   297 diff -r 4401d3c453d3 mcabber/mcabber/commands.c
   296 --- a/mcabber/mcabber/commands.c	Mon Jul 30 22:39:17 2012 +0200
   298 --- a/mcabber/mcabber/commands.c	Wed Aug 08 14:31:24 2012 +0300
   297 +++ b/mcabber/mcabber/commands.c	Wed Aug 01 03:56:16 2012 +0300
   299 +++ b/mcabber/mcabber/commands.c	Wed Aug 08 14:32:45 2012 +0300
   298 @@ -94,6 +94,7 @@
   300 @@ -94,6 +94,7 @@
   299  static void do_otrpolicy(char *arg);
   301  static void do_otrpolicy(char *arg);
   300  static void do_echo(char *arg);
   302  static void do_echo(char *arg);
   301  static void do_module(char *arg);
   303  static void do_module(char *arg);
   302 +static void do_exit(char *arg);
   304 +static void do_exit(char *arg);
   309            NULL);
   311            NULL);
   310 +  cmd_add("exit",  "Exit mcabber", 0, 0, &do_exit, NULL);
   312 +  cmd_add("exit",  "Exit mcabber", 0, 0, &do_exit, NULL);
   311    cmd_add("group", "Change group display settings",
   313    cmd_add("group", "Change group display settings",
   312            COMPL_GROUP, COMPL_GROUPNAME, &do_group, NULL);
   314            COMPL_GROUP, COMPL_GROUPNAME, &do_group, NULL);
   313    cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help, NULL);
   315    cmd_add("help", "Display some help", COMPL_CMD, 0, &do_help, NULL);
   314 @@ -4120,7 +4122,9 @@
   316 @@ -4118,7 +4120,9 @@
   315  
   317  
   316  static void do_disconnect(char *arg)
   318  static void do_disconnect(char *arg)
   317  {
   319  {
   318 -  xmpp_disconnect();
   320 -  xmpp_disconnect();
   319 +  char *message = to_utf8(arg);
   321 +  char *message = to_utf8(arg);
   320 +  xmpp_disconnect(message);
   322 +  xmpp_disconnect(message);
   321 +  g_free(message);
   323 +  g_free(message);
   322  }
   324  }
   323  
   325  
   324  static void do_help(char *arg)
   326  static void do_help(char *arg)
   325 @@ -4134,4 +4138,14 @@
   327 @@ -4132,4 +4136,14 @@
   326      scr_print_logwindow(arg);
   328      scr_print_logwindow(arg);
   327  }
   329  }
   328  
   330  
   329 +static void do_exit(char *arg)
   331 +static void do_exit(char *arg)
   330 +{
   332 +{
   335 +  }
   337 +  }
   336 +  mcabber_set_terminate_ui();
   338 +  mcabber_set_terminate_ui();
   337 +}
   339 +}
   338 +
   340 +
   339  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
   341  /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
   340 diff -r 26edaf6ea10b mcabber/mcabber/main.c
   342 diff -r 4401d3c453d3 mcabber/mcabber/main.c
   341 --- a/mcabber/mcabber/main.c	Mon Jul 30 22:39:17 2012 +0200
   343 --- a/mcabber/mcabber/main.c	Wed Aug 08 14:31:24 2012 +0300
   342 +++ b/mcabber/mcabber/main.c	Wed Aug 01 03:56:16 2012 +0300
   344 +++ b/mcabber/mcabber/main.c	Wed Aug 08 14:32:45 2012 +0300
   343 @@ -83,7 +83,7 @@
   345 @@ -87,7 +87,7 @@
   344  #ifndef MODULES_ENABLE
   346  #ifndef MODULES_ENABLE
   345    fifo_deinit();
   347    fifo_deinit();
   346  #endif
   348  #endif
   347 -  xmpp_disconnect();
   349 -  xmpp_disconnect();
   348 +  xmpp_disconnect(NULL);
   350 +  xmpp_disconnect(NULL);
   349    scr_terminate_curses();
   351    scr_terminate_curses();
   350  
   352  
   351    // Restore term settings, if needed.
   353    // Restore term settings, if needed.
   352 @@ -512,7 +512,7 @@
   354 @@ -520,7 +520,7 @@
   353  #ifdef HAVE_LIBOTR
   355  #ifdef HAVE_LIBOTR
   354    otr_terminate();
   356    otr_terminate();
   355  #endif
   357  #endif
   356 -  xmpp_disconnect();
   358 -  xmpp_disconnect();
   357 +  xmpp_disconnect(NULL);
   359 +  xmpp_disconnect(NULL);
   358  #ifdef HAVE_GPGME
   360  #ifdef HAVE_GPGME
   359    gpg_terminate();
   361    gpg_terminate();
   360  #endif
   362  #endif
   361 diff -r 26edaf6ea10b mcabber/mcabber/xmpp.c
   363 diff -r 4401d3c453d3 mcabber/mcabber/xmpp.c
   362 --- a/mcabber/mcabber/xmpp.c	Mon Jul 30 22:39:17 2012 +0200
   364 --- a/mcabber/mcabber/xmpp.c	Wed Aug 08 14:31:24 2012 +0300
   363 +++ b/mcabber/mcabber/xmpp.c	Wed Aug 01 03:56:16 2012 +0300
   365 +++ b/mcabber/mcabber/xmpp.c	Wed Aug 08 14:32:45 2012 +0300
   364 @@ -892,7 +892,7 @@
   366 @@ -885,7 +885,7 @@
   365  
   367  
   366  static void _try_to_reconnect(void)
   368  static void _try_to_reconnect(void)
   367  {
   369  {
   368 -  xmpp_disconnect();
   370 -  xmpp_disconnect();
   369 +  xmpp_disconnect(NULL);
   371 +  xmpp_disconnect(NULL);
   370    if (AutoConnection)
   372    if (AutoConnection)
   371      g_timeout_add_seconds(RECONNECTION_TIMEOUT + (random() % 90L),
   373      g_timeout_add_seconds(RECONNECTION_TIMEOUT + (random() % 90L),
   372                            xmpp_reconnect, NULL);
   374                            xmpp_reconnect, NULL);
   373 @@ -1801,7 +1801,7 @@
   375 @@ -1827,7 +1827,7 @@
   374    LmMessageHandler *handler;
   376    LmMessageHandler *handler;
   375    GError *error = NULL;
   377    GError *error = NULL;
   376  
   378  
   377 -  xmpp_disconnect();
   379 -  xmpp_disconnect();
   378 +  xmpp_disconnect(NULL);
   380 +  xmpp_disconnect(NULL);
   379  
   381  
   380    servername = settings_opt_get("server");
   382    servername = settings_opt_get("server");
   381    userjid    = settings_opt_get("jid");
   383    userjid    = settings_opt_get("jid");
   382 @@ -1975,7 +1975,7 @@
   384 @@ -2000,7 +2000,7 @@
   383    lm_message_node_set_attribute(y, "ver", ver);
   385    lm_message_node_set_attribute(y, "ver", ver);
   384  }
   386  }
   385  
   387  
   386 -void xmpp_disconnect(void)
   388 -void xmpp_disconnect(void)
   387 +void xmpp_disconnect(const char *message)
   389 +void xmpp_disconnect(const char *message)
   388  {
   390  {
   389    if (!lconnection)
   391    if (!lconnection)
   390      return;
   392      return;
   391 @@ -1983,7 +1983,7 @@
   393 @@ -2008,7 +2008,7 @@
   392      // Launch pre-disconnect internal hook
   394      // Launch pre-disconnect internal hook
   393      hk_predisconnect();
   395      hk_predisconnect();
   394      // Announce it to  everyone else
   396      // Announce it to  everyone else
   395 -    xmpp_setstatus(offline, NULL, "", FALSE);
   397 -    xmpp_setstatus(offline, NULL, "", FALSE);
   396 +    xmpp_setstatus(offline, NULL, message, FALSE);
   398 +    xmpp_setstatus(offline, NULL, message, FALSE);
   397    }
   399    }
   398    if (lm_connection_is_open(lconnection))
   400    if (lm_connection_is_open(lconnection))
   399      lm_connection_close(lconnection, NULL);
   401      lm_connection_close(lconnection, NULL);
   400 diff -r 26edaf6ea10b mcabber/mcabber/xmpp.h
   402 diff -r 4401d3c453d3 mcabber/mcabber/xmpp.h
   401 --- a/mcabber/mcabber/xmpp.h	Mon Jul 30 22:39:17 2012 +0200
   403 --- a/mcabber/mcabber/xmpp.h	Wed Aug 08 14:31:24 2012 +0300
   402 +++ b/mcabber/mcabber/xmpp.h	Wed Aug 01 03:56:16 2012 +0300
   404 +++ b/mcabber/mcabber/xmpp.h	Wed Aug 08 14:32:45 2012 +0300
   403 @@ -35,7 +35,7 @@
   405 @@ -37,7 +37,7 @@
   404  extern LmSSL* lssl;
   406  
   405  
   407  void xmpp_init(void); /* private */
   406  int  xmpp_connect(void);
   408  int  xmpp_connect(void);
   407 -void xmpp_disconnect(void);
   409 -void xmpp_disconnect(void);
   408 +void xmpp_disconnect(const char *message);
   410 +void xmpp_disconnect(const char *message);
   409  gboolean xmpp_is_online(void);
   411  gboolean xmpp_is_online(void);
   410  
   412