# HG changeset patch

Allow to specify status message, when going offline

@@ -1,3 +1,11 @@

+

+experimental (38)

+

+ * experimental patch add-offline-message

+ * xmpp_disconnect now accepts status message

+

+  -- Myhailo Danylenko, 2012-07-31

+

 experimental (37)

  * Change branch to "experimental".

   -- Myhailo Danylenko, 2012-10-18

+experimental (36)

+

+ * experimental patch add-offline-message

+ * xmpp_disconnect now accepts status message

+

+  -- Myhailo Danylenko, 2012-07-31

+

 experimental (35)

  * Change branch to "experimental".

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 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ý.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [message]

 Przerywa połączenie z serwerem Jabbera.

-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.

\ 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -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.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [сообщение]

 Завершает соединение с Jabber-сервером.

+Вы можете указать сообщение статуса при выходе.

 Примечание: список контактов доступен только когда соединение с сервером активно, поэтому список контактов пуст при завершении соединения.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -0,0 +1,6 @@

+

+ /EXIT [сообщение]

+

+

+Эта команда завершает все активные соединения и выходит из mcabber`а.

+Отличается от /QUIT тем, что позволяет указать сообщение статуса при выходе.

@@ -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.

@@ -1,5 +1,6 @@

- /DISCONNECT

+ /DISCONNECT [повідомлення]

 Розірвати з'єднання з сервером.

+Ви можете вказати повідомлення статусу відсутності.

 Майте на увазі, що список контактів зберігається на сервері, отож після від'єднання ви його більше не побачите.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

@@ -0,0 +1,5 @@

+

+ /EXIT [повідомлення]

+

+Закриває всі з’єднання та завершує мкаббер.

+Відмінність цієї команди від /QUIT у тому, що ви можете вказати повідомлення статусу відсутності.

 #include <mcabber/config.h> // For MCABBER_BRANCH

-#define MCABBER_API_VERSION 37

-#define MCABBER_API_MIN     37

+#define MCABBER_API_VERSION 38

+#define MCABBER_API_MIN     38

 #define MCABBER_BRANCH_EXPERIMENTAL 1

@@ -94,6 +94,7 @@

 static void do_otrpolicy(char *arg);

 static void do_echo(char *arg);

 static void do_module(char *arg);

+static void do_exit(char *arg);

 static void room_bookmark(gpointer bud, char *arg);

@@ -199,6 +200,7 @@

   cmd_add("echo", "Display a string in the log window", 0, 0, &do_echo, NULL);

   cmd_add("event", "Process an event", COMPL_EVENTSID, COMPL_EVENTS, &do_event,

           NULL);

+  cmd_add("exit",  "Exit mcabber", 0, 0, &do_exit, NULL);

   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);

@@ -4119,7 +4121,9 @@

 static void do_disconnect(char *arg)

 {

-  xmpp_disconnect();

+  char *message = to_utf8(arg);

+  xmpp_disconnect(message);

+  g_free(message);

 }

 static void do_help(char *arg)

@@ -4133,4 +4137,14 @@

     scr_print_logwindow(arg);

 }

+static void do_exit(char *arg)

+{

+  if (arg) {

+    char *message = to_utf8(arg);

+    settings_set(SETTINGS_TYPE_OPTION, "message_offline", message);

+    g_free(message);

+  }

+  mcabber_set_terminate_ui();

+}

+

 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */

@@ -87,7 +87,7 @@

 #ifndef MODULES_ENABLE

   fifo_deinit();

 #endif

-  xmpp_disconnect();

+  xmpp_disconnect(NULL);

   scr_terminate_curses();

   // Restore term settings, if needed.

@@ -520,7 +520,7 @@

 #ifdef HAVE_LIBOTR

   otr_terminate();

 #endif

-  xmpp_disconnect();

+  xmpp_disconnect(NULL);

 #ifdef HAVE_GPGME

   gpg_terminate();

 #endif

@@ -372,7 +372,12 @@

 // - if no message is found, return NULL

 const gchar *settings_get_status_msg(enum imstatus status)

 {

-  const gchar *rstatus = settings_opt_get("message");

+  const gchar *rstatus;

+

+  if (status == offline)

+    return settings_opt_get("message_offline");

+

+  rstatus = settings_opt_get("message");

   if (rstatus) return rstatus;

@@ -397,7 +402,7 @@

         rstatus = settings_opt_get("message_away");

         break;

-    default: // offline, invisible

+    default: // ?

         break;

   }

   return rstatus;

@@ -884,7 +884,7 @@

 static void _try_to_reconnect(void)

 {

-  xmpp_disconnect();

+  xmpp_disconnect(NULL);

   if (AutoConnection)

     g_timeout_add_seconds(RECONNECTION_TIMEOUT + (random() % 90L),

                           xmpp_reconnect, NULL);

@@ -1830,7 +1830,7 @@

   LmMessageHandler *handler;

   GError *error = NULL;

-  xmpp_disconnect();

+  xmpp_disconnect(NULL);

   servername = settings_opt_get("server");

   userjid    = settings_opt_get("jid");

@@ -2003,7 +2003,7 @@

   lm_message_node_set_attribute(y, "ver", ver);

 }

-void xmpp_disconnect(void)

+void xmpp_disconnect(const char *message)

 {

   if (!lconnection)

     return;

@@ -2011,7 +2011,7 @@

     // Launch pre-disconnect internal hook

     hk_predisconnect();

     // Announce it to  everyone else

-    xmpp_setstatus(offline, NULL, "", FALSE);

+    xmpp_setstatus(offline, NULL, message, FALSE);

   }

   if (lm_connection_is_open(lconnection))

     lm_connection_close(lconnection, NULL);

@@ -37,7 +37,7 @@

 void xmpp_init(void); /* private */

 int  xmpp_connect(void);

-void xmpp_disconnect(void);

+void xmpp_disconnect(const char *message);

 gboolean xmpp_is_online(void);

 void xmpp_room_join(const char *room, const char *nickname, const char *passwd);

@@ -358,6 +358,9 @@

 #set message_notavail  = I'm not available

 #set message_away      = I'm away

 #

+# Default offline message will not be overridden by 'message'.

+#set message_offline = Bye!

+#

 # 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.