pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 05:46:38 +02:00
Code Activity

Allow /reconnect on servers that are not currently connected

Browse Source
This commit is contained in:
Sebastien Helleu
2010-12-09 19:42:45 +01:00
parent d847a6ed74
commit 4d4a034567
11 changed files with 22 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
po/cs.po
+1 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-11-06 11:55+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/de.po
+1 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.3-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-12-07 23:21+0100\n"
"Last-Translator: Nils G.\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/es.po
+1 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-11-06 11:56+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/fr.po
+2 -50
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"PO-Revision-Date: 2010-12-07 08:39+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-12-09 19:32+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -7333,51 +7333,3 @@ msgstr "Hashtable (sortie)"
msgid "Pointer"
msgstr "Pointeur"
#~ msgid ""
#~ "time format for each line displayed in buffers (see man strftime for date/"
#~ "time specifiers)"
#~ msgstr ""
#~ "format de date/heure pour chaque ligne affichée dans les tampons (voir "
#~ "man strftime pour le format de date/heure)"
#~ msgid "[-server server] receiver[,receiver] text"
#~ msgstr "[-server serveur] cible[,cible] texte"
#~ msgid "[-server server] nickname text"
#~ msgstr "[-server serveur] pseudo texte"
#~ msgid ""
#~ " server: send to this server (internal name)\n"
#~ "nickname: user to send notice to\n"
#~ " text: text to send"
#~ msgstr ""
#~ "serveur: envoyer à ce serveur (nom interne)\n"
#~ " pseudo: pseudo cible pour la notice\n"
#~ " texte: texte à envoyer"
#~ msgid "items of bar"
#~ msgstr "objets de la barre"
#~ msgid "time format for each line displayed in buffers"
#~ msgstr "format de date/heure pour chaque ligne affichée dans les tampons"
#~ msgid "time format for \"time\" bar item"
#~ msgstr "format de date/heure pour l'objet de barre \"time\""
#~ msgid "file containing the certificate authorities"
#~ msgstr "fichier contenant les autorités de certification"
#~ msgid "ssl certificate file used to automatically identify your nick"
#~ msgstr ""
#~ "fichier de certificat ssl utilisé pour identifier automatiquement votre "
#~ "pseudo"
#~ msgid "path for writing incoming files"
#~ msgstr "chemin où écrire les fichiers reçus"
#~ msgid ""
#~ "path for reading files when sending (when no path is specified by user)"
#~ msgstr ""
#~ "chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié "
#~ "par l'utilisateur)"
po/hu.po
+1 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-11-05 17:17+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/it.po
+1 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-12-04 11:57+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/pl.po
+1 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-11-06 11:56+0100\n"
"Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/pt_BR.po
+1 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-11-13 09:26+0100\n"
"Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/ru.po
+1 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: 2010-11-05 17:17+0100\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
po/weechat.pot
+1 -1
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-12-07 19:35+0100\n"
"POT-Creation-Date: 2010-12-09 19:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
src/plugins/irc/irc-command.c
+11 -17
View File
@@ -3149,18 +3149,15 @@ irc_command_reconnect_one_server (struct t_irc_server *server, int no_join)
if (!server)
return 0;
if ((!server->is_connected) && (!server->hook_connect)
&& (!server->hook_fd))
if ((server->is_connected) || (server->hook_connect) || (server->hook_fd))
{
weechat_printf (server->buffer,
_("%s%s: not connected to server \"%s\"!"),
weechat_prefix ("error"), IRC_PLUGIN_NAME,
server->name);
return 0;
/* disconnect from server */
irc_command_quit_server (server, NULL);
irc_server_disconnect (server, 0, 0);
}
irc_command_quit_server (server, NULL);
irc_server_disconnect (server, 0, 0);
server->disable_autojoin = no_join;
if (irc_server_connect (server))
{
server->reconnect_delay = 0;
@@ -3181,14 +3178,13 @@ irc_command_reconnect (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
int i, nb_reconnect, reconnect_ok, all_servers, no_join;
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
(void) argv_eol;
nb_reconnect = 0;
reconnect_ok = 1;
all_servers = 0;
@@ -3206,9 +3202,7 @@ irc_command_reconnect (void *data, struct t_gui_buffer *buffer, int argc,
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
nb_reconnect++;
if ((ptr_server->is_connected) || (ptr_server->hook_connect)
|| (ptr_server->hook_fd))
if (ptr_server->buffer)
{
if (!irc_command_reconnect_one_server (ptr_server, no_join))
reconnect_ok = 0;
@@ -3217,6 +3211,7 @@ irc_command_reconnect (void *data, struct t_gui_buffer *buffer, int argc,
}
else
{
nb_reconnect = 0;
for (i = 1; i < argc; i++)
{
if (argv[i][0] != '-')
@@ -3238,11 +3233,10 @@ irc_command_reconnect (void *data, struct t_gui_buffer *buffer, int argc,
}
}
}
if (nb_reconnect == 0)
reconnect_ok = irc_command_reconnect_one_server (ptr_server, no_join);
}
if (nb_reconnect == 0)
reconnect_ok = irc_command_reconnect_one_server (ptr_server, no_join);
if (!reconnect_ok)
return WEECHAT_RC_ERROR;