pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-27 21:36:37 +02:00
Code Activity

Improved command /server ant its output, added plural form in PO files

Browse Source
This commit is contained in:
Sebastien Helleu
2007-07-18 16:35:12 +00:00
parent bd0b7957a3
commit 271bd21802
34 changed files with 4532 additions and 3618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2007-07-18
Version 0.2.6 (under dev!):
* improved command /server ant its output
* added 3 default new keys: ctrl-B (left), ctrl-F (right), ctrl-D (delete)
* added "buffer_move" event handler to plugins API (task #6708)
* added key function "jump_previous_buffer" to jump to buffer previously
doc/de/weechat_commands.xml
+20 -17
View File
@@ -159,23 +159,6 @@ mit einem Server oder mehreren Servern neu verbinden
servername: server name to reconnect
-nojoin: do not join any channel (even if autojoin is enabled on server)
</programlisting>
<command>server [Servername] | [Servername Hostname Port [-auto | -noauto] [-ipv6] [-ssl] [-pwd Passwort] [-nicks Nick1 Nick2 Nick3] [-username Benutzername] [-realname Name] [-command Befehl] [-autojoin Channel[,Channel]] ] | [del Servername]</command>
<programlisting>
Auflisten, Hinzufügen oder Entfernen von Servern
Servername: anzuzeigender Servername
Hostname: Name oder IP-Adresse des Servers
Port: Port des Servers
ipv6: IPv6 benutzen
ssl: SSL benutzen
Passwort: Serverpasswort
Nick1: erster Nickname
Nick2: zweiter Nickname
Nick3: dritter Nicname
Benutzername: Benutzername
Realname: voller Name des Benutzers
</programlisting>
<command>save [Datei]</command>
<programlisting>
@@ -183,6 +166,26 @@ Konfiguration abspeichern
Datei: Name der zu speichernden Konfigurationsdatei
</programlisting>
<command>server [list [servername]] | [listfull [servername]] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
<programlisting>
Auflisten, Hinzufügen oder Entfernen von Servern
list: list servers (no parameter implies this list)
listfull: list servers with detailed info for each server
servername: server name, for internal and display use
hostname: name or IP address of server
port: port for server (integer)
ipv6: use IPv6 protocol
ssl: use SSL protocol
password: password for server
nick1: first nick for server
nick2: alternate nick for server
nick3: second alternate nick for server
username: user name
realname: real name of user
del: delete a server
</programlisting>
<command>set [Option [ = Wert]]</command>
<programlisting>
doc/en/weechat_commands.xml
+11 -8
View File
@@ -159,10 +159,19 @@ servername: server name to reconnect
-nojoin: do not join any channel (even if autojoin is enabled on server)
</programlisting>
<command>server [servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
<command>save [file]</command>
<programlisting>
save config to disk
file: filename for writing config
</programlisting>
<command>server [list [servername]] | [listfull [servername]] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
<programlisting>
list, add or remove servers
list: list servers (no parameter implies this list)
listfull: list servers with detailed info for each server
servername: server name, for internal and display use
hostname: name or IP address of server
port: port for server (integer)
@@ -174,13 +183,7 @@ servername: server name, for internal and display use
nick3: second alternate nick for server
username: user name
realname: real name of user
</programlisting>
<command>save [file]</command>
<programlisting>
save config to disk
file: filename for writing config
del: delete a server
</programlisting>
<command>set [option [ = value]]</command>
doc/fr/weechat_commands.xml
+11 -8
View File
@@ -159,10 +159,19 @@ nom_serveur: nom du serveur pour se reconnecter
-nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
</programlisting>
<command>server [nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]</command>
<command>save [fichier]</command>
<programlisting>
sauvegarder la configuration sur disque
fichier: fichier pour sauvegarder la configuration
</programlisting>
<command>server [list [nom_serveur]] | [listfull [nom_serveur]] | [nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]</command>
<programlisting>
liste, ajoute ou retire des serveurs
list: afficher les serveurs (pas de paramètre implique cette liste)
listfull: afficher les serveurs avec de l'info détaillée pour chaque
nom_serveur: nom du serveur, pour usage interne et affichage
nom/IP: nom ou adresse IP du serveur
port: port pour le serveur (nombre entier)
@@ -174,13 +183,7 @@ liste, ajoute ou retire des serveurs
pseudo3: second pseudo alternatif pour le serveur
nom_utilisateur: nom d'utilisateur
nom_réel: nom réel de l'utilisateur
</programlisting>
<command>save [fichier]</command>
<programlisting>
sauvegarder la configuration sur disque
fichier: fichier pour sauvegarder la configuration
del: supprimer un serveur
</programlisting>
<command>set [option [ = valeur]]</command>
po/Makevars
+1 -1
View File
@@ -1,7 +1,7 @@
DOMAIN = $(PACKAGE)
subdir = po
top_builddir = ..
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=NG_:1,2
COPYRIGHT_HOLDER =
EXTRA_LOCALE_CATEGORIES =
MSGID_BUGS_ADDRESS = flashcode@flashtux.org
po/cs.po
+287 -235
View File
File diff suppressed because it is too large Load Diff
po/de.po
+287 -235
View File
File diff suppressed because it is too large Load Diff
po/es.po
+289 -235
View File
File diff suppressed because it is too large Load Diff
po/fr.po
+295 -240
View File
File diff suppressed because it is too large Load Diff
po/hu.po
+286 -234
View File
File diff suppressed because it is too large Load Diff
po/ru.po
+289 -235
View File
File diff suppressed because it is too large Load Diff
po/weechat.pot
+286 -247
View File
File diff suppressed because it is too large Load Diff
src/common/command.c
+82 -42
View File
@@ -172,13 +172,18 @@ t_weechat_command weechat_commands[] =
"servername: server name to reconnect\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)"),
"%S|-all|-nojoin|%*", 0, MAX_ARGS, 0, weechat_cmd_reconnect, NULL },
{ "save", N_("save config to disk"),
N_("[file]"), N_("file: filename for writing config"),
NULL, 0, 1, 0, weechat_cmd_save, NULL },
{ "server", N_("list, add or remove servers"),
N_("[servername] | "
N_("[list [servername]] | [listfull [servername]] | "
"[servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 "
"nick2 nick3] [-username username] [-realname realname] "
"[-command command] [-autojoin channel[,channel]] ] | "
"[del servername]"),
N_("servername: server name, for internal and display use\n"
N_(" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server\n"
" port: port for server (integer)\n"
" ipv6: use IPv6 protocol\n"
@@ -188,11 +193,9 @@ t_weechat_command weechat_commands[] =
" nick2: alternate nick for server\n"
" nick3: second alternate nick for server\n"
" username: user name\n"
" realname: real name of user"),
NULL, 0, MAX_ARGS, 0, weechat_cmd_server, NULL },
{ "save", N_("save config to disk"),
N_("[file]"), N_("file: filename for writing config"),
NULL, 0, 1, 0, weechat_cmd_save, NULL },
" realname: real name of user\n"
" del: delete a server"),
"del|list|listfull", 0, MAX_ARGS, 0, weechat_cmd_server, NULL },
{ "set", N_("set config options"),
N_("[option [ = value]]"),
N_("option: name of an option (if name is full "
@@ -536,26 +539,28 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s wrong argument count for %s command \"%s\" "
"(expected: %d arg%s)\n"),
NG_("%s wrong argument count for %s command \"%s\" "
"(expected: %d arg)\n",
"%s wrong argument count for %s command \"%s\" "
"(expected: %d args)\n",
weechat_commands[i].max_arg),
WEECHAT_ERROR, PACKAGE_NAME,
command + 1,
weechat_commands[i].max_arg,
(weechat_commands[i].max_arg >
1) ? "s" : "");
weechat_commands[i].max_arg);
}
else
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s wrong argument count for %s command \"%s\" "
"(expected: between %d and %d arg%s)\n"),
NG_("%s wrong argument count for %s command \"%s\" "
"(expected: between %d and %d arg)\n",
"%s wrong argument count for %s command \"%s\" "
"(expected: between %d and %d args)\n",
weechat_commands[i].max_arg),
WEECHAT_ERROR, PACKAGE_NAME,
command + 1,
weechat_commands[i].min_arg,
weechat_commands[i].max_arg,
(weechat_commands[i].max_arg >
1) ? "s" : "");
weechat_commands[i].max_arg);
}
}
else
@@ -605,24 +610,28 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf
(NULL,
_("%s wrong argument count for IRC command \"%s\" "
"(expected: %d arg%s)\n"),
NG_("%s wrong argument count for IRC command \"%s\" "
"(expected: %d arg)\n",
"%s wrong argument count for IRC command \"%s\" "
"(expected: %d args)\n",
irc_commands[i].max_arg),
WEECHAT_ERROR,
command + 1,
irc_commands[i].max_arg,
(irc_commands[i].max_arg > 1) ? "s" : "");
irc_commands[i].max_arg);
}
else
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf
(NULL,
_("%s wrong argument count for IRC command \"%s\" "
"(expected: between %d and %d arg%s)\n"),
NG_("%s wrong argument count for IRC command \"%s\" "
"(expected: between %d and %d arg)\n",
"%s wrong argument count for IRC command \"%s\" "
"(expected: between %d and %d args)\n",
irc_commands[i].max_arg),
WEECHAT_ERROR,
command + 1,
irc_commands[i].min_arg, irc_commands[i].max_arg,
(irc_commands[i].max_arg > 1) ? "s" : "");
irc_commands[i].min_arg, irc_commands[i].max_arg);
}
}
else
@@ -2933,24 +2942,42 @@ weechat_cmd_server (t_irc_server *server, t_irc_channel *channel,
{
t_gui_window *window;
t_gui_buffer *buffer;
int i;
int i, detailed_list, one_server_found;
t_irc_server server_tmp, *ptr_server, *server_found, *new_server;
t_gui_buffer *ptr_buffer;
char *server_name;
gui_buffer_find_context (server, channel, &window, &buffer);
if ((argc == 0) || (argc == 1))
if ((argc == 0) || (argc == 1)
|| (ascii_strcasecmp (argv[0], "list") == 0)
|| (ascii_strcasecmp (argv[0], "listfull") == 0))
{
/* list all servers */
if (argc == 0)
/* list servers */
server_name = NULL;
detailed_list = 0;
for (i = 0; i < argc; i++)
{
if (ascii_strcasecmp (argv[i], "list") == 0)
continue;
if (ascii_strcasecmp (argv[i], "listfull") == 0)
{
detailed_list = 1;
continue;
}
if (!server_name)
server_name = argv[i];
}
if (!server_name)
{
if (irc_servers)
{
gui_printf (NULL, "\n");
gui_printf (NULL, _("All servers:\n"));
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
irc_display_server (ptr_server);
irc_display_server (ptr_server, detailed_list);
}
}
else
@@ -2961,13 +2988,27 @@ weechat_cmd_server (t_irc_server *server, t_irc_channel *channel,
}
else
{
ptr_server = irc_server_search (argv[0]);
if (ptr_server)
irc_display_server (ptr_server);
else
one_server_found = 0;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
if (ascii_strcasestr (ptr_server->name, server_name))
{
if (!one_server_found)
{
gui_printf (NULL, "\n");
gui_printf (NULL, _("Servers with '%s':\n"),
server_name);
}
one_server_found = 1;
irc_display_server (ptr_server, detailed_list);
}
}
if (!one_server_found)
{
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf (NULL, _("Server '%s' not found.\n"), argv[0]);
gui_printf (NULL, _("No server with '%s' found.\n"),
server_name);
}
}
}
@@ -3847,14 +3888,13 @@ weechat_cmd_unignore (t_irc_server *server, t_irc_channel *channel,
if (ret)
{
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf (NULL, "%s%d%s ",
gui_printf (NULL,
NG_("%s%d%s ignore was removed.\n",
"%s%d%s ignore were removed.\n",
ret),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
ret,
GUI_COLOR(COLOR_WIN_CHAT));
if (ret > 1)
gui_printf (NULL, _("ignore were removed.\n"));
else
gui_printf (NULL, _("ignore was removed.\n"));
}
else
{
@@ -4004,7 +4044,7 @@ weechat_cmd_uptime (t_irc_server *server, t_irc_channel *channel,
snprintf (string, sizeof (string),
_("WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"),
day,
(day > 1) ? _("days") : _("day"),
NG_("day", "days", day),
hour,
min,
sec,
@@ -4022,7 +4062,7 @@ weechat_cmd_uptime (t_irc_server *server, t_irc_channel *channel,
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
day,
GUI_COLOR(COLOR_WIN_CHAT),
(day > 1) ? _("days") : _("day"),
NG_("day", "days", day),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
hour,
GUI_COLOR(COLOR_WIN_CHAT),
src/common/weechat.h
+5 -3
View File
@@ -38,15 +38,17 @@
#else
#include "../../intl/libintl.h"
#endif
#define _(x) gettext(x)
#define _(string) gettext(string)
#define NG_(single,plural,number) ngettext(single,plural,number)
#ifdef gettext_noop
#define N_(string) gettext_noop (string)
#define N_(string) gettext_noop(string)
#else
#define N_(string) (string)
#endif
#endif
#if !defined(_)
#define _(x) (x)
#define _(string) (string)
#define NG_(single,plural,number) (plural)
#define N_(string) (string)
#endif
src/irc/irc-display.c
+95 -68
View File
@@ -376,78 +376,105 @@ irc_display_mode (t_irc_server *server, t_gui_buffer *buffer,
*/
void
irc_display_server (t_irc_server *server)
irc_display_server (t_irc_server *server, int with_detail)
{
char *string;
int num_channels;
gui_printf (NULL, "\n");
gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
GUI_COLOR(COLOR_WIN_CHAT),
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
server->name,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->is_connected) ?
_("connected") : _("not connected"),
GUI_COLOR(COLOR_WIN_CHAT_DARK));
gui_printf (NULL, " server_autoconnect . . . . : %s%s\n",
(server->autoconnect) ? _("on") : _("off"),
(server->command_line) ?
_(" (temporary server, will not be saved)") : "");
gui_printf (NULL, " server_autoreconnect . . . : %s\n",
(server->autoreconnect) ? _("on") : _("off"));
gui_printf (NULL, " server_autoreconnect_delay : %d %s\n",
server->autoreconnect_delay,
_("seconds"));
gui_printf (NULL, " server_address . . . . . . : %s\n",
server->address);
gui_printf (NULL, " server_port . . . . . . . : %d\n",
server->port);
gui_printf (NULL, " server_ipv6 . . . . . . . : %s\n",
(server->ipv6) ? _("on") : _("off"));
gui_printf (NULL, " server_ssl . . . . . . . . : %s\n",
(server->ssl) ? _("on") : _("off"));
gui_printf (NULL, " server_password . . . . . : %s\n",
(server->password && server->password[0]) ?
_("(hidden)") : "");
gui_printf (NULL, " server_nick1/2/3 . . . . . : %s %s/ %s%s %s/ %s%s\n",
server->nick1,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick2,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick3);
gui_printf (NULL, " server_username . . . . . : %s\n",
server->username);
gui_printf (NULL, " server_realname . . . . . : %s\n",
server->realname);
gui_printf (NULL, " server_hostname . . . . . : %s\n",
(server->hostname) ? server->hostname : "");
if (server->command && server->command[0])
string = strdup (server->command);
else
string = NULL;
if (string)
if (with_detail)
{
if (cfg_log_hide_nickserv_pwd)
irc_display_hide_password (string, 1);
gui_printf (NULL, " server_command . . . . . . : %s\n",
string);
free (string);
gui_printf (NULL, "\n");
gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
GUI_COLOR(COLOR_WIN_CHAT),
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
server->name,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->is_connected) ?
_("connected") : _("not connected"),
GUI_COLOR(COLOR_WIN_CHAT_DARK));
gui_printf (NULL, " server_autoconnect . . . . : %s%s\n",
(server->autoconnect) ? _("on") : _("off"),
(server->command_line) ?
_(" (temporary server, will not be saved)") : "");
gui_printf (NULL, " server_autoreconnect . . . : %s\n",
(server->autoreconnect) ? _("on") : _("off"));
gui_printf (NULL, " server_autoreconnect_delay : %d %s\n",
server->autoreconnect_delay,
_("seconds"));
gui_printf (NULL, " server_address . . . . . . : %s\n",
server->address);
gui_printf (NULL, " server_port . . . . . . . : %d\n",
server->port);
gui_printf (NULL, " server_ipv6 . . . . . . . : %s\n",
(server->ipv6) ? _("on") : _("off"));
gui_printf (NULL, " server_ssl . . . . . . . . : %s\n",
(server->ssl) ? _("on") : _("off"));
gui_printf (NULL, " server_password . . . . . : %s\n",
(server->password && server->password[0]) ?
_("(hidden)") : "");
gui_printf (NULL, " server_nick1/2/3 . . . . . : %s %s/ %s%s %s/ %s%s\n",
server->nick1,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick2,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick3);
gui_printf (NULL, " server_username . . . . . : %s\n",
server->username);
gui_printf (NULL, " server_realname . . . . . : %s\n",
server->realname);
gui_printf (NULL, " server_hostname . . . . . : %s\n",
(server->hostname) ? server->hostname : "");
if (server->command && server->command[0])
string = strdup (server->command);
else
string = NULL;
if (string)
{
if (cfg_log_hide_nickserv_pwd)
irc_display_hide_password (string, 1);
gui_printf (NULL, " server_command . . . . . . : %s\n",
string);
free (string);
}
else
gui_printf (NULL, " server_command . . . . . . : %s\n",
(server->command && server->command[0]) ?
server->command : "");
gui_printf (NULL, " server_command_delay . . . : %d %s\n",
server->command_delay,
_("seconds"));
gui_printf (NULL, " server_autojoin . . . . . : %s\n",
(server->autojoin && server->autojoin[0]) ?
server->autojoin : "");
gui_printf (NULL, " server_notify_levels . . . : %s\n",
(server->notify_levels && server->notify_levels[0]) ?
server->notify_levels : "");
}
else
gui_printf (NULL, " server_command . . . . . . : %s\n",
(server->command && server->command[0]) ?
server->command : "");
gui_printf (NULL, " server_command_delay . . . : %d %s\n",
server->command_delay,
_("seconds"));
gui_printf (NULL, " server_autojoin . . . . . : %s\n",
(server->autojoin && server->autojoin[0]) ?
server->autojoin : "");
gui_printf (NULL, " server_notify_levels . . . : %s\n",
(server->notify_levels && server->notify_levels[0]) ?
server->notify_levels : "");
{
gui_printf (NULL, " %s %s%s ",
(server->is_connected) ? "*" : " ",
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
server->name);
gui_printf (NULL, "%s[%s%s",
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->is_connected) ?
_("connected") : _("not connected"));
if (server->is_connected)
{
num_channels = irc_server_get_channel_count (server);
gui_printf (NULL, ", ");
gui_printf (NULL, NG_("%d channel", "%d channels", num_channels),
num_channels);
}
gui_printf (NULL, "%s]%s%s\n",
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->command_line) ? _(" (temporary)") : "");
}
}
src/irc/irc-server.c
+19
View File
@@ -2092,6 +2092,25 @@ irc_server_name_already_exists (char *name)
return 0;
}
/*
* irc_server_get_channel_count: return number of channels for server
*/
int
irc_server_get_channel_count (t_irc_server *server)
{
int count;
t_irc_channel *ptr_channel;
count = 0;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
count++;
}
return count;
}
/*
* irc_server_remove_away: remove away for all chans/nicks (for all servers)
*/
src/irc/irc.h
+2 -1
View File
@@ -398,6 +398,7 @@ extern t_irc_server *irc_server_search (char *);
extern int irc_server_get_number_connected ();
extern void irc_server_get_number_buffer (t_irc_server *, int *, int *);
extern int irc_server_name_already_exists (char *);
extern int irc_server_get_channel_count (t_irc_server *);
extern void irc_server_remove_away ();
extern void irc_server_check_away ();
extern void irc_server_set_away (t_irc_server *, char *, int);
@@ -474,7 +475,7 @@ extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, char *, int,
extern void irc_display_away (t_irc_server *, char *, char *);
extern void irc_display_mode (t_irc_server *, t_gui_buffer *, char *, char *,
char, char *, char *, char *, char *);
extern void irc_display_server (t_irc_server *ptr_server);
extern void irc_display_server (t_irc_server *ptr_server, int);
/* IRC commands issued by user (irc-send.c) */
weechat/ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2007-07-18
Version 0.2.6 (under dev!):
* improved command /server ant its output
* added 3 default new keys: ctrl-B (left), ctrl-F (right), ctrl-D (delete)
* added "buffer_move" event handler to plugins API (task #6708)
* added key function "jump_previous_buffer" to jump to buffer previously
weechat/doc/de/weechat_commands.xml
+20 -17
View File
@@ -159,23 +159,6 @@ mit einem Server oder mehreren Servern neu verbinden
servername: server name to reconnect
-nojoin: do not join any channel (even if autojoin is enabled on server)
</programlisting>
<command>server [Servername] | [Servername Hostname Port [-auto | -noauto] [-ipv6] [-ssl] [-pwd Passwort] [-nicks Nick1 Nick2 Nick3] [-username Benutzername] [-realname Name] [-command Befehl] [-autojoin Channel[,Channel]] ] | [del Servername]</command>
<programlisting>
Auflisten, Hinzufügen oder Entfernen von Servern
Servername: anzuzeigender Servername
Hostname: Name oder IP-Adresse des Servers
Port: Port des Servers
ipv6: IPv6 benutzen
ssl: SSL benutzen
Passwort: Serverpasswort
Nick1: erster Nickname
Nick2: zweiter Nickname
Nick3: dritter Nicname
Benutzername: Benutzername
Realname: voller Name des Benutzers
</programlisting>
<command>save [Datei]</command>
<programlisting>
@@ -183,6 +166,26 @@ Konfiguration abspeichern
Datei: Name der zu speichernden Konfigurationsdatei
</programlisting>
<command>server [list [servername]] | [listfull [servername]] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
<programlisting>
Auflisten, Hinzufügen oder Entfernen von Servern
list: list servers (no parameter implies this list)
listfull: list servers with detailed info for each server
servername: server name, for internal and display use
hostname: name or IP address of server
port: port for server (integer)
ipv6: use IPv6 protocol
ssl: use SSL protocol
password: password for server
nick1: first nick for server
nick2: alternate nick for server
nick3: second alternate nick for server
username: user name
realname: real name of user
del: delete a server
</programlisting>
<command>set [Option [ = Wert]]</command>
<programlisting>
weechat/doc/en/weechat_commands.xml
+11 -8
View File
@@ -159,10 +159,19 @@ servername: server name to reconnect
-nojoin: do not join any channel (even if autojoin is enabled on server)
</programlisting>
<command>server [servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
<command>save [file]</command>
<programlisting>
save config to disk
file: filename for writing config
</programlisting>
<command>server [list [servername]] | [listfull [servername]] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname realname] [-command command] [-autojoin channel[,channel]] ] | [del servername]</command>
<programlisting>
list, add or remove servers
list: list servers (no parameter implies this list)
listfull: list servers with detailed info for each server
servername: server name, for internal and display use
hostname: name or IP address of server
port: port for server (integer)
@@ -174,13 +183,7 @@ servername: server name, for internal and display use
nick3: second alternate nick for server
username: user name
realname: real name of user
</programlisting>
<command>save [file]</command>
<programlisting>
save config to disk
file: filename for writing config
del: delete a server
</programlisting>
<command>set [option [ = value]]</command>
weechat/doc/fr/weechat_commands.xml
+11 -8
View File
@@ -159,10 +159,19 @@ nom_serveur: nom du serveur pour se reconnecter
-nojoin: ne rejoindre aucun canal (même si l'autojoin est activé pour le serveur)
</programlisting>
<command>server [nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]</command>
<command>save [fichier]</command>
<programlisting>
sauvegarder la configuration sur disque
fichier: fichier pour sauvegarder la configuration
</programlisting>
<command>server [list [nom_serveur]] | [listfull [nom_serveur]] | [nom_serveur] | [nom_serveur nom/IP port [-auto | -noauto] [-ipv6] [-ssl] [-pwd mot_de_passe] [-nicks pseudo1 pseudo2 pseudo3] [-username nom_utilisateur] [-realname nom_réel] [-command commande] [-autojoin canal[,canal]] ] | [del nom_serveur]</command>
<programlisting>
liste, ajoute ou retire des serveurs
list: afficher les serveurs (pas de paramètre implique cette liste)
listfull: afficher les serveurs avec de l'info détaillée pour chaque
nom_serveur: nom du serveur, pour usage interne et affichage
nom/IP: nom ou adresse IP du serveur
port: port pour le serveur (nombre entier)
@@ -174,13 +183,7 @@ liste, ajoute ou retire des serveurs
pseudo3: second pseudo alternatif pour le serveur
nom_utilisateur: nom d'utilisateur
nom_réel: nom réel de l'utilisateur
</programlisting>
<command>save [fichier]</command>
<programlisting>
sauvegarder la configuration sur disque
fichier: fichier pour sauvegarder la configuration
del: supprimer un serveur
</programlisting>
<command>set [option [ = valeur]]</command>
weechat/po/Makevars
+1 -1
View File
@@ -1,7 +1,7 @@
DOMAIN = $(PACKAGE)
subdir = po
top_builddir = ..
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=NG_:1,2
COPYRIGHT_HOLDER =
EXTRA_LOCALE_CATEGORIES =
MSGID_BUGS_ADDRESS = flashcode@flashtux.org
weechat/po/cs.po
+287 -235
View File
File diff suppressed because it is too large Load Diff
weechat/po/de.po
+287 -235
View File
File diff suppressed because it is too large Load Diff
weechat/po/es.po
+289 -235
View File
File diff suppressed because it is too large Load Diff
weechat/po/fr.po
+295 -240
View File
File diff suppressed because it is too large Load Diff
weechat/po/hu.po
+286 -234
View File
File diff suppressed because it is too large Load Diff
weechat/po/ru.po
+289 -235
View File
File diff suppressed because it is too large Load Diff
weechat/po/weechat.pot
+286 -247
View File
File diff suppressed because it is too large Load Diff
weechat/src/common/command.c
+82 -42
View File
@@ -172,13 +172,18 @@ t_weechat_command weechat_commands[] =
"servername: server name to reconnect\n"
" -nojoin: do not join any channel (even if autojoin is enabled on server)"),
"%S|-all|-nojoin|%*", 0, MAX_ARGS, 0, weechat_cmd_reconnect, NULL },
{ "save", N_("save config to disk"),
N_("[file]"), N_("file: filename for writing config"),
NULL, 0, 1, 0, weechat_cmd_save, NULL },
{ "server", N_("list, add or remove servers"),
N_("[servername] | "
N_("[list [servername]] | [listfull [servername]] | "
"[servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-pwd password] [-nicks nick1 "
"nick2 nick3] [-username username] [-realname realname] "
"[-command command] [-autojoin channel[,channel]] ] | "
"[del servername]"),
N_("servername: server name, for internal and display use\n"
N_(" list: list servers (no parameter implies this list)\n"
" listfull: list servers with detailed info for each server\n"
"servername: server name, for internal and display use\n"
" hostname: name or IP address of server\n"
" port: port for server (integer)\n"
" ipv6: use IPv6 protocol\n"
@@ -188,11 +193,9 @@ t_weechat_command weechat_commands[] =
" nick2: alternate nick for server\n"
" nick3: second alternate nick for server\n"
" username: user name\n"
" realname: real name of user"),
NULL, 0, MAX_ARGS, 0, weechat_cmd_server, NULL },
{ "save", N_("save config to disk"),
N_("[file]"), N_("file: filename for writing config"),
NULL, 0, 1, 0, weechat_cmd_save, NULL },
" realname: real name of user\n"
" del: delete a server"),
"del|list|listfull", 0, MAX_ARGS, 0, weechat_cmd_server, NULL },
{ "set", N_("set config options"),
N_("[option [ = value]]"),
N_("option: name of an option (if name is full "
@@ -536,26 +539,28 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s wrong argument count for %s command \"%s\" "
"(expected: %d arg%s)\n"),
NG_("%s wrong argument count for %s command \"%s\" "
"(expected: %d arg)\n",
"%s wrong argument count for %s command \"%s\" "
"(expected: %d args)\n",
weechat_commands[i].max_arg),
WEECHAT_ERROR, PACKAGE_NAME,
command + 1,
weechat_commands[i].max_arg,
(weechat_commands[i].max_arg >
1) ? "s" : "");
weechat_commands[i].max_arg);
}
else
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf (NULL,
_("%s wrong argument count for %s command \"%s\" "
"(expected: between %d and %d arg%s)\n"),
NG_("%s wrong argument count for %s command \"%s\" "
"(expected: between %d and %d arg)\n",
"%s wrong argument count for %s command \"%s\" "
"(expected: between %d and %d args)\n",
weechat_commands[i].max_arg),
WEECHAT_ERROR, PACKAGE_NAME,
command + 1,
weechat_commands[i].min_arg,
weechat_commands[i].max_arg,
(weechat_commands[i].max_arg >
1) ? "s" : "");
weechat_commands[i].max_arg);
}
}
else
@@ -605,24 +610,28 @@ exec_weechat_command (t_irc_server *server, t_irc_channel *channel, char *string
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf
(NULL,
_("%s wrong argument count for IRC command \"%s\" "
"(expected: %d arg%s)\n"),
NG_("%s wrong argument count for IRC command \"%s\" "
"(expected: %d arg)\n",
"%s wrong argument count for IRC command \"%s\" "
"(expected: %d args)\n",
irc_commands[i].max_arg),
WEECHAT_ERROR,
command + 1,
irc_commands[i].max_arg,
(irc_commands[i].max_arg > 1) ? "s" : "");
irc_commands[i].max_arg);
}
else
{
irc_display_prefix (NULL, NULL, PREFIX_ERROR);
gui_printf
(NULL,
_("%s wrong argument count for IRC command \"%s\" "
"(expected: between %d and %d arg%s)\n"),
NG_("%s wrong argument count for IRC command \"%s\" "
"(expected: between %d and %d arg)\n",
"%s wrong argument count for IRC command \"%s\" "
"(expected: between %d and %d args)\n",
irc_commands[i].max_arg),
WEECHAT_ERROR,
command + 1,
irc_commands[i].min_arg, irc_commands[i].max_arg,
(irc_commands[i].max_arg > 1) ? "s" : "");
irc_commands[i].min_arg, irc_commands[i].max_arg);
}
}
else
@@ -2933,24 +2942,42 @@ weechat_cmd_server (t_irc_server *server, t_irc_channel *channel,
{
t_gui_window *window;
t_gui_buffer *buffer;
int i;
int i, detailed_list, one_server_found;
t_irc_server server_tmp, *ptr_server, *server_found, *new_server;
t_gui_buffer *ptr_buffer;
char *server_name;
gui_buffer_find_context (server, channel, &window, &buffer);
if ((argc == 0) || (argc == 1))
if ((argc == 0) || (argc == 1)
|| (ascii_strcasecmp (argv[0], "list") == 0)
|| (ascii_strcasecmp (argv[0], "listfull") == 0))
{
/* list all servers */
if (argc == 0)
/* list servers */
server_name = NULL;
detailed_list = 0;
for (i = 0; i < argc; i++)
{
if (ascii_strcasecmp (argv[i], "list") == 0)
continue;
if (ascii_strcasecmp (argv[i], "listfull") == 0)
{
detailed_list = 1;
continue;
}
if (!server_name)
server_name = argv[i];
}
if (!server_name)
{
if (irc_servers)
{
gui_printf (NULL, "\n");
gui_printf (NULL, _("All servers:\n"));
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
irc_display_server (ptr_server);
irc_display_server (ptr_server, detailed_list);
}
}
else
@@ -2961,13 +2988,27 @@ weechat_cmd_server (t_irc_server *server, t_irc_channel *channel,
}
else
{
ptr_server = irc_server_search (argv[0]);
if (ptr_server)
irc_display_server (ptr_server);
else
one_server_found = 0;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
if (ascii_strcasestr (ptr_server->name, server_name))
{
if (!one_server_found)
{
gui_printf (NULL, "\n");
gui_printf (NULL, _("Servers with '%s':\n"),
server_name);
}
one_server_found = 1;
irc_display_server (ptr_server, detailed_list);
}
}
if (!one_server_found)
{
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf (NULL, _("Server '%s' not found.\n"), argv[0]);
gui_printf (NULL, _("No server with '%s' found.\n"),
server_name);
}
}
}
@@ -3847,14 +3888,13 @@ weechat_cmd_unignore (t_irc_server *server, t_irc_channel *channel,
if (ret)
{
irc_display_prefix (NULL, NULL, PREFIX_INFO);
gui_printf (NULL, "%s%d%s ",
gui_printf (NULL,
NG_("%s%d%s ignore was removed.\n",
"%s%d%s ignore were removed.\n",
ret),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
ret,
GUI_COLOR(COLOR_WIN_CHAT));
if (ret > 1)
gui_printf (NULL, _("ignore were removed.\n"));
else
gui_printf (NULL, _("ignore was removed.\n"));
}
else
{
@@ -4004,7 +4044,7 @@ weechat_cmd_uptime (t_irc_server *server, t_irc_channel *channel,
snprintf (string, sizeof (string),
_("WeeChat uptime: %d %s %02d:%02d:%02d, started on %s"),
day,
(day > 1) ? _("days") : _("day"),
NG_("day", "days", day),
hour,
min,
sec,
@@ -4022,7 +4062,7 @@ weechat_cmd_uptime (t_irc_server *server, t_irc_channel *channel,
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
day,
GUI_COLOR(COLOR_WIN_CHAT),
(day > 1) ? _("days") : _("day"),
NG_("day", "days", day),
GUI_COLOR(COLOR_WIN_CHAT_CHANNEL),
hour,
GUI_COLOR(COLOR_WIN_CHAT),
weechat/src/common/weechat.h
+5 -3
View File
@@ -38,15 +38,17 @@
#else
#include "../../intl/libintl.h"
#endif
#define _(x) gettext(x)
#define _(string) gettext(string)
#define NG_(single,plural,number) ngettext(single,plural,number)
#ifdef gettext_noop
#define N_(string) gettext_noop (string)
#define N_(string) gettext_noop(string)
#else
#define N_(string) (string)
#endif
#endif
#if !defined(_)
#define _(x) (x)
#define _(string) (string)
#define NG_(single,plural,number) (plural)
#define N_(string) (string)
#endif
weechat/src/irc/irc-display.c
+95 -68
View File
@@ -376,78 +376,105 @@ irc_display_mode (t_irc_server *server, t_gui_buffer *buffer,
*/
void
irc_display_server (t_irc_server *server)
irc_display_server (t_irc_server *server, int with_detail)
{
char *string;
int num_channels;
gui_printf (NULL, "\n");
gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
GUI_COLOR(COLOR_WIN_CHAT),
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
server->name,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->is_connected) ?
_("connected") : _("not connected"),
GUI_COLOR(COLOR_WIN_CHAT_DARK));
gui_printf (NULL, " server_autoconnect . . . . : %s%s\n",
(server->autoconnect) ? _("on") : _("off"),
(server->command_line) ?
_(" (temporary server, will not be saved)") : "");
gui_printf (NULL, " server_autoreconnect . . . : %s\n",
(server->autoreconnect) ? _("on") : _("off"));
gui_printf (NULL, " server_autoreconnect_delay : %d %s\n",
server->autoreconnect_delay,
_("seconds"));
gui_printf (NULL, " server_address . . . . . . : %s\n",
server->address);
gui_printf (NULL, " server_port . . . . . . . : %d\n",
server->port);
gui_printf (NULL, " server_ipv6 . . . . . . . : %s\n",
(server->ipv6) ? _("on") : _("off"));
gui_printf (NULL, " server_ssl . . . . . . . . : %s\n",
(server->ssl) ? _("on") : _("off"));
gui_printf (NULL, " server_password . . . . . : %s\n",
(server->password && server->password[0]) ?
_("(hidden)") : "");
gui_printf (NULL, " server_nick1/2/3 . . . . . : %s %s/ %s%s %s/ %s%s\n",
server->nick1,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick2,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick3);
gui_printf (NULL, " server_username . . . . . : %s\n",
server->username);
gui_printf (NULL, " server_realname . . . . . : %s\n",
server->realname);
gui_printf (NULL, " server_hostname . . . . . : %s\n",
(server->hostname) ? server->hostname : "");
if (server->command && server->command[0])
string = strdup (server->command);
else
string = NULL;
if (string)
if (with_detail)
{
if (cfg_log_hide_nickserv_pwd)
irc_display_hide_password (string, 1);
gui_printf (NULL, " server_command . . . . . . : %s\n",
string);
free (string);
gui_printf (NULL, "\n");
gui_printf (NULL, _("%sServer: %s%s %s[%s%s%s]\n"),
GUI_COLOR(COLOR_WIN_CHAT),
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
server->name,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->is_connected) ?
_("connected") : _("not connected"),
GUI_COLOR(COLOR_WIN_CHAT_DARK));
gui_printf (NULL, " server_autoconnect . . . . : %s%s\n",
(server->autoconnect) ? _("on") : _("off"),
(server->command_line) ?
_(" (temporary server, will not be saved)") : "");
gui_printf (NULL, " server_autoreconnect . . . : %s\n",
(server->autoreconnect) ? _("on") : _("off"));
gui_printf (NULL, " server_autoreconnect_delay : %d %s\n",
server->autoreconnect_delay,
_("seconds"));
gui_printf (NULL, " server_address . . . . . . : %s\n",
server->address);
gui_printf (NULL, " server_port . . . . . . . : %d\n",
server->port);
gui_printf (NULL, " server_ipv6 . . . . . . . : %s\n",
(server->ipv6) ? _("on") : _("off"));
gui_printf (NULL, " server_ssl . . . . . . . . : %s\n",
(server->ssl) ? _("on") : _("off"));
gui_printf (NULL, " server_password . . . . . : %s\n",
(server->password && server->password[0]) ?
_("(hidden)") : "");
gui_printf (NULL, " server_nick1/2/3 . . . . . : %s %s/ %s%s %s/ %s%s\n",
server->nick1,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick2,
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
server->nick3);
gui_printf (NULL, " server_username . . . . . : %s\n",
server->username);
gui_printf (NULL, " server_realname . . . . . : %s\n",
server->realname);
gui_printf (NULL, " server_hostname . . . . . : %s\n",
(server->hostname) ? server->hostname : "");
if (server->command && server->command[0])
string = strdup (server->command);
else
string = NULL;
if (string)
{
if (cfg_log_hide_nickserv_pwd)
irc_display_hide_password (string, 1);
gui_printf (NULL, " server_command . . . . . . : %s\n",
string);
free (string);
}
else
gui_printf (NULL, " server_command . . . . . . : %s\n",
(server->command && server->command[0]) ?
server->command : "");
gui_printf (NULL, " server_command_delay . . . : %d %s\n",
server->command_delay,
_("seconds"));
gui_printf (NULL, " server_autojoin . . . . . : %s\n",
(server->autojoin && server->autojoin[0]) ?
server->autojoin : "");
gui_printf (NULL, " server_notify_levels . . . : %s\n",
(server->notify_levels && server->notify_levels[0]) ?
server->notify_levels : "");
}
else
gui_printf (NULL, " server_command . . . . . . : %s\n",
(server->command && server->command[0]) ?
server->command : "");
gui_printf (NULL, " server_command_delay . . . : %d %s\n",
server->command_delay,
_("seconds"));
gui_printf (NULL, " server_autojoin . . . . . : %s\n",
(server->autojoin && server->autojoin[0]) ?
server->autojoin : "");
gui_printf (NULL, " server_notify_levels . . . : %s\n",
(server->notify_levels && server->notify_levels[0]) ?
server->notify_levels : "");
{
gui_printf (NULL, " %s %s%s ",
(server->is_connected) ? "*" : " ",
GUI_COLOR(COLOR_WIN_CHAT_SERVER),
server->name);
gui_printf (NULL, "%s[%s%s",
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->is_connected) ?
_("connected") : _("not connected"));
if (server->is_connected)
{
num_channels = irc_server_get_channel_count (server);
gui_printf (NULL, ", ");
gui_printf (NULL, NG_("%d channel", "%d channels", num_channels),
num_channels);
}
gui_printf (NULL, "%s]%s%s\n",
GUI_COLOR(COLOR_WIN_CHAT_DARK),
GUI_COLOR(COLOR_WIN_CHAT),
(server->command_line) ? _(" (temporary)") : "");
}
}
weechat/src/irc/irc-server.c
+19
View File
@@ -2092,6 +2092,25 @@ irc_server_name_already_exists (char *name)
return 0;
}
/*
* irc_server_get_channel_count: return number of channels for server
*/
int
irc_server_get_channel_count (t_irc_server *server)
{
int count;
t_irc_channel *ptr_channel;
count = 0;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
count++;
}
return count;
}
/*
* irc_server_remove_away: remove away for all chans/nicks (for all servers)
*/
weechat/src/irc/irc.h
+2 -1
View File
@@ -398,6 +398,7 @@ extern t_irc_server *irc_server_search (char *);
extern int irc_server_get_number_connected ();
extern void irc_server_get_number_buffer (t_irc_server *, int *, int *);
extern int irc_server_name_already_exists (char *);
extern int irc_server_get_channel_count (t_irc_server *);
extern void irc_server_remove_away ();
extern void irc_server_check_away ();
extern void irc_server_set_away (t_irc_server *, char *, int);
@@ -474,7 +475,7 @@ extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, char *, int,
extern void irc_display_away (t_irc_server *, char *, char *);
extern void irc_display_mode (t_irc_server *, t_gui_buffer *, char *, char *,
char, char *, char *, char *, char *);
extern void irc_display_server (t_irc_server *ptr_server);
extern void irc_display_server (t_irc_server *ptr_server, int);
/* IRC commands issued by user (irc-send.c) */