pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 22:05:42 +02:00
Code Activity

Move /away command from irc plugin to core

Browse Source
This commit is contained in:
Sebastien Helleu
2010-03-19 19:28:19 +01:00
parent 568d913c58
commit bc3fa9fd4c
23 changed files with 323 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/en/autogen/user/irc_commands.txt
-9
View File
@@ -41,15 +41,6 @@
/allserv away I'm away
........................................
• *`/away`* `[-all] [message]`::
........................................
toggle away status
-all: toggle away status on all connected servers
message: message for away (if no message is given, away status is removed)
........................................
• *`/ban`* `[channel] [nickname [nickname ...]]`::
........................................
doc/en/autogen/user/weechat_commands.txt
+9
View File
@@ -1,3 +1,12 @@
• *`/away`* `[-all] [message]`::
........................................
toggle away status
-all: toggle away status on all connected servers
message: message for away (if no message is given, away status is removed)
........................................
• *`/bar`* `[add barname type[,cond1,cond2,...] position size separator item1,item2,...] | [default] | [del barname|-all] | [set barname option value] | [hide|show|toggle barname] | [scroll barname buffer scroll_value] | [list] | [listfull] | [listitems]`::
........................................
doc/fr/autogen/user/irc_commands.txt
-9
View File
@@ -41,15 +41,6 @@
/allserv away Je suis absent
........................................
• *`/away`* `[-all] [message]`::
........................................
basculer le statut absent
-all: basculer le statut absent sur tous les serveurs connectés
message: message pour l'absence (si pas de message donné, le statut d'absence est supprimé)
........................................
• *`/ban`* `[canal] [pseudo [pseudo ...]]`::
........................................
doc/fr/autogen/user/weechat_commands.txt
+9
View File
@@ -1,3 +1,12 @@
• *`/away`* `[-all] [message]`::
........................................
basculer le statut absent
-all: basculer le statut absent sur tous les serveurs connectés
message: message pour l'absence (si pas de message donné, le statut d'absence est supprimé)
........................................
• *`/bar`* `[add nombarre type[,cond1,cond2,...] position taille separateur objet1,objet2,...] | [default] | [del nombarre|-all] | [set nombarre option valeur] | [hide|show|toggle nombarre] | [scroll nombarre tampon valeur_scroll] | [list] | [listfull] | [listitems]`::
........................................
doc/it/autogen/user/irc_commands.txt
-9
View File
@@ -41,15 +41,6 @@
/allserv away sono assente
........................................
• *`/away`* `[-all] [messaggio]`::
........................................
attiva/disattiva lo stato di assenza
-all: attiva/disattiva lo stato di assenza su tutti i server connessi
messaggio: messaggio di assenza (se non specificato, lo stato di assenza viene rimosso)
........................................
• *`/ban`* `[canale] [nick [nick ...]]`::
........................................
doc/it/autogen/user/weechat_commands.txt
+9
View File
@@ -1,3 +1,12 @@
• *`/away`* `[-all] [messaggio]`::
........................................
attiva/disattiva lo stato di assenza
-all: attiva/disattiva lo stato di assenza su tutti i server connessi
messaggio: messaggio di assenza (se non specificato, lo stato di assenza viene rimosso)
........................................
• *`/bar`* `[add nome_barra tipo[,cond1,cond2,...] posizione dimensione separatore elemento1,elemento2,...] | [default] | [del nome_barra|-all] | [set nome_barra opzione valore] | [hide|show|toggle nome_barra] | [scroll nome_barra buffer scroll_value] | [list] | [listfull] | [listitems]`::
........................................
po/cs.po
+15 -15
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-03-05 10:43+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -714,6 +714,20 @@ msgstr ""
"%sChyba: nemohu spojit okna, není zde další okno se stejnou velikostí poblíž "
"aktuálního okna"
msgid "toggle away status"
msgstr "přepnout status nepřítomnosti"
msgid "[-all] [message]"
msgstr "[-all] [zpráva]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: přepnout status nečinnosti na všech připojených serverech\n"
"zpráva: zpráva pro nepřítomnost (pokud není zadána je status nepřítomnosti "
"odebrán)"
msgid "manage bars"
msgstr "řídit pole"
@@ -3098,20 +3112,6 @@ msgstr ""
" nastavit pryč na věech serverech:\n"
" /allserv away I'm away"
msgid "toggle away status"
msgstr "přepnout status nepřítomnosti"
msgid "[-all] [message]"
msgstr "[-all] [zpráva]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: přepnout status nečinnosti na všech připojených serverech\n"
"zpráva: zpráva pro nepřítomnost (pokud není zadána je status nepřítomnosti "
"odebrán)"
msgid "ban nicks or hosts"
msgstr "zakázat přezdívky nebo hosty"
po/de.po
+15 -15
View File
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-03-04 10:19+0100\n"
"Last-Translator: Nils G <weechatter@arcor.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -728,6 +728,20 @@ msgstr ""
"%sFehler: kann Fenster nicht vereinigen, es ist kein Fenster mit der "
"gleichen Größe in der Nähe des aktuellen Fensters."
msgid "toggle away status"
msgstr "Abwesenheitszustand ein-/ausschalten"
msgid "[-all] [message]"
msgstr "[-all] [Nachricht]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: Abwesenheitszustand auf allen Servern ändern\n"
"Nachricht: Abwesenheitsnachricht (ohne eine Nachricht wird der "
"Abwesenheitszustand deaktivieren)"
msgid "manage bars"
msgstr "Infobars verwalten"
@@ -3226,20 +3240,6 @@ msgstr ""
" Setzt den Status, auf allen Servern,auf abwesend:\n"
" /allserv away I'm away"
msgid "toggle away status"
msgstr "Abwesenheitszustand ein-/ausschalten"
msgid "[-all] [message]"
msgstr "[-all] [Nachricht]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: Abwesenheitszustand auf allen Servern ändern\n"
"Nachricht: Abwesenheitsnachricht (ohne eine Nachricht wird der "
"Abwesenheitszustand deaktivieren)"
msgid "ban nicks or hosts"
msgstr "Nicknamen oder Hosts sperren/verbannen"
po/es.po
+16 -16
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-02-23 10:43+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -712,6 +712,21 @@ msgstr ""
"%sError: no puede unir las ventanas, no hay ninguna otra ventana con el "
"mismo tamaño de la actual."
msgid "toggle away status"
msgstr "activa/desactiva el estado ausente"
msgid "[-all] [message]"
msgstr "[-all] [mensaje]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: activa/desactiva el estado ausente en todos los servidores "
"conectados\n"
"mensaje: mensaje de ausencia (si no se da ningún mensaje, se remueve el "
"estado ausente)"
msgid "manage bars"
msgstr "gestionar las barras"
@@ -3126,21 +3141,6 @@ msgstr ""
" poner ausente en todos los servidores:\n"
" /allserv away Estoy ausente"
msgid "toggle away status"
msgstr "activa/desactiva el estado ausente"
msgid "[-all] [message]"
msgstr "[-all] [mensaje]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: activa/desactiva el estado ausente en todos los servidores "
"conectados\n"
"mensaje: mensaje de ausencia (si no se da ningún mensaje, se remueve el "
"estado ausente)"
msgid "ban nicks or hosts"
msgstr "veta apodos o hosts"
po/fr.po
+15 -15
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-03-14 16:44+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -712,6 +712,20 @@ msgstr ""
"%sErreur: impossible de fusionner les fenêtres, aucun autre fenêtre avec la "
"même taille à coté de la fenêtre actuelle"
msgid "toggle away status"
msgstr "basculer le statut absent"
msgid "[-all] [message]"
msgstr "[-all] [message]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: basculer le statut absent sur tous les serveurs connectés\n"
"message: message pour l'absence (si pas de message donné, le statut "
"d'absence est supprimé)"
msgid "manage bars"
msgstr "gestion des barres"
@@ -3177,20 +3191,6 @@ msgstr ""
" positionner l'absence sur tous les serveurs :\n"
" /allserv away Je suis absent"
msgid "toggle away status"
msgstr "basculer le statut absent"
msgid "[-all] [message]"
msgstr "[-all] [message]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: basculer le statut absent sur tous les serveurs connectés\n"
"message: message pour l'absence (si pas de message donné, le statut "
"d'absence est supprimé)"
msgid "ban nicks or hosts"
msgstr "bannit des pseudos ou hôtes"
po/hu.po
+15 -15
View File
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-02-23 10:43+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -767,6 +767,20 @@ msgstr ""
"%s nem sikerült az ablakokat összefésülni: nincs a közelben azonos méretű "
"ablak.\n"
msgid "toggle away status"
msgstr "távolléti státusz váltása"
msgid "[-all] [message]"
msgstr "[-all] [üzenet]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: távolléti státusz váltása minden csatlakoztatott szerveren\n"
" üzenet: távolléti üzenet (ha nincs üzenet megadva, a távolléti státusz "
"eltávolítása)"
#, fuzzy
msgid "manage bars"
msgstr "pufferek kezelése"
@@ -2974,20 +2988,6 @@ msgid ""
" /allserv away I'm away"
msgstr ""
msgid "toggle away status"
msgstr "távolléti státusz váltása"
msgid "[-all] [message]"
msgstr "[-all] [üzenet]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: távolléti státusz váltása minden csatlakoztatott szerveren\n"
" üzenet: távolléti üzenet (ha nincs üzenet megadva, a távolléti státusz "
"eltávolítása)"
#, fuzzy
msgid "ban nicks or hosts"
msgstr "név vagy gép letiltása"
po/it.po
+15 -15
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Weechat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-02-23 10:43+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -711,6 +711,20 @@ msgstr ""
"%sErrore: impossibile unire le finestre, non c'è un'altra finestra della "
"stessa dimensione vicino quella corrente"
msgid "toggle away status"
msgstr "attiva/disattiva lo stato di assenza"
msgid "[-all] [message]"
msgstr "[-all] [messaggio]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: attiva/disattiva lo stato di assenza su tutti i server connessi\n"
"messaggio: messaggio di assenza (se non specificato, lo stato di assenza "
"viene rimosso)"
msgid "manage bars"
msgstr "gestione barre"
@@ -3129,20 +3143,6 @@ msgstr ""
" imposta l'assenza su tutti i server:\n"
" /allserv away sono assente"
msgid "toggle away status"
msgstr "attiva/disattiva lo stato di assenza"
msgid "[-all] [message]"
msgstr "[-all] [messaggio]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: attiva/disattiva lo stato di assenza su tutti i server connessi\n"
"messaggio: messaggio di assenza (se non specificato, lo stato di assenza "
"viene rimosso)"
msgid "ban nicks or hosts"
msgstr "banna nick oppure host"
po/pl.po
+15 -15
View File
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-02-23 10:43+0100\n"
"Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
"Language-Team: Polish\n"
@@ -726,6 +726,20 @@ msgstr ""
"%sBłąd: nie można scalić okien, nie ma innego okna o takim samym rozmiarze w "
"pobliżu obecnego"
msgid "toggle away status"
msgstr "zmienia status nieobecności"
msgid "[-all] [message]"
msgstr "[-all] [wiadomość]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: zmienia stan nieobecnośći na wszystkich połączonych serwerach\n"
"wiadomość: powód nieobecnośći (jeśli nie podano wiadomości status "
"nieobecności zostaje usunięty)"
msgid "manage bars"
msgstr "zarządzaj paskami"
@@ -3132,20 +3146,6 @@ msgstr ""
" ustawia stan nieobecności na wszystkich serwerach:\n"
" /allserv away Jestem nieobecny"
msgid "toggle away status"
msgstr "zmienia status nieobecności"
msgid "[-all] [message]"
msgstr "[-all] [wiadomość]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: zmienia stan nieobecnośći na wszystkich połączonych serwerach\n"
"wiadomość: powód nieobecnośći (jeśli nie podano wiadomości status "
"nieobecności zostaje usunięty)"
msgid "ban nicks or hosts"
msgstr "banuje nick albo host"
po/ru.po
+14 -14
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+0100\n"
"PO-Revision-Date: 2010-02-23 10:43+0100\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -769,6 +769,19 @@ msgstr ""
"%s не могу объединить окна, есть другое окно такого-же размера рядом с "
"текущим.\n"
msgid "toggle away status"
msgstr "переключает статус \"отошёл\""
msgid "[-all] [message]"
msgstr "[-all] [сообщение]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: включить режим \"отсутствую\" на всех подключенных серверах\n"
"сообщение: причина отсутствия (если сообщения нет - статус снимается)"
#, fuzzy
msgid "manage bars"
msgstr "управление буферами"
@@ -2987,19 +3000,6 @@ msgid ""
" /allserv away I'm away"
msgstr ""
msgid "toggle away status"
msgstr "переключает статус \"отошёл\""
msgid "[-all] [message]"
msgstr "[-all] [сообщение]"
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
" -all: включить режим \"отсутствую\" на всех подключенных серверах\n"
"сообщение: причина отсутствия (если сообщения нет - статус снимается)"
#, fuzzy
msgid "ban nicks or hosts"
msgstr "банит ник или хост"
po/weechat.pot
+12 -12
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-03-14 16:43+0100\n"
"POT-Creation-Date: 2010-03-19 13:59+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"
@@ -678,6 +678,17 @@ msgid ""
"current one"
msgstr ""
msgid "toggle away status"
msgstr ""
msgid "[-all] [message]"
msgstr ""
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
msgid "manage bars"
msgstr ""
@@ -2604,17 +2615,6 @@ msgid ""
" /allserv away I'm away"
msgstr ""
msgid "toggle away status"
msgstr ""
msgid "[-all] [message]"
msgstr ""
msgid ""
" -all: toggle away status on all connected servers\n"
"message: message for away (if no message is given, away status is removed)"
msgstr ""
msgid "ban nicks or hosts"
msgstr ""
src/core/wee-command.c
+14
View File
@@ -62,6 +62,12 @@
#include "../plugins/plugin-config.h"
/*
* command_away: toggle away status
*/
COMMAND_EMPTY(away)
/*
* command_bar_list: list bars
*/
@@ -4066,6 +4072,14 @@ command_window (void *data, struct t_gui_buffer *buffer,
void
command_init ()
{
hook_command (NULL, "away",
N_("toggle away status"),
N_("[-all] [message]"),
N_(" -all: toggle away status on all connected "
"servers\n"
"message: message for away (if no message is "
"given, away status is removed)"),
"-all", &command_away, NULL);
hook_command (NULL, "bar",
N_("manage bars"),
N_("[add barname type[,cond1,cond2,...] position size "
src/core/wee-command.h
+19
View File
@@ -20,6 +20,25 @@
#ifndef __WEECHAT_COMMAND_H
#define __WEECHAT_COMMAND_H 1
/*
* This macro is used to create an "empty" command in WeeChat core:
* command does nothing, but plugins or scripts can catch it when it
* is used by user, with weechat_hook_command_run("/xxx", ...)
* where "xxx" is command name.
*/
#define COMMAND_EMPTY(__command) \
int \
command_##__command (void *data, struct t_gui_buffer *buffer, \
int argc, char **argv, char **argv_eol) \
{ \
(void) data; \
(void) buffer; \
(void) argc; \
(void) argv; \
(void) argv_eol; \
return WEECHAT_RC_OK; \
}
struct t_gui_buffer;
extern int command_reload (void *data, struct t_gui_buffer *buffer,
src/plugins/irc/irc-buffer.c
+1 -1
View File
@@ -116,7 +116,7 @@ irc_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
{
struct t_irc_channel *next_channel;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
src/plugins/irc/irc-buffer.h
+18
View File
@@ -20,6 +20,24 @@
#ifndef __WEECHAT_IRC_BUFFER_H
#define __WEECHAT_IRC_BUFFER_H 1
#define IRC_BUFFER_GET_SERVER(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
irc_buffer_get_server_channel (__buffer, &ptr_server, NULL);
#define IRC_BUFFER_GET_SERVER_CHANNEL(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
struct t_irc_channel *ptr_channel = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
{ \
irc_buffer_get_server_channel (__buffer, &ptr_server, \
&ptr_channel); \
}
#define IRC_BUFFER_RAW_NAME "irc_raw"
#define IRC_BUFFER_RAW_PREFIX_RECV "-->"
#define IRC_BUFFER_RAW_PREFIX_RECV_MOD "==>"
src/plugins/irc/irc-command.c
+100 -79
View File
File diff suppressed because it is too large Load Diff
src/plugins/irc/irc-completion.c
+9 -9
View File
@@ -44,7 +44,7 @@ irc_completion_server_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -69,7 +69,7 @@ irc_completion_server_nick_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -96,7 +96,7 @@ irc_completion_server_channels_cb (void *data, const char *completion_item,
{
struct t_irc_channel *ptr_channel;
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -131,7 +131,7 @@ irc_completion_server_privates_cb (void *data, const char *completion_item,
{
struct t_irc_channel *ptr_channel;
IRC_GET_SERVER(buffer);
IRC_BUFFER_GET_SERVER(buffer);
/* make C compiler happy */
(void) data;
@@ -167,7 +167,7 @@ irc_completion_server_nicks_cb (void *data, const char *completion_item,
struct t_irc_channel *ptr_channel2;
struct t_irc_nick *ptr_nick;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -232,7 +232,7 @@ irc_completion_channel_cb (void *data, const char *completion_item,
struct t_gui_buffer *buffer,
struct t_gui_completion *completion)
{
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -289,7 +289,7 @@ irc_completion_channel_nicks_cb (void *data, const char *completion_item,
{
struct t_irc_nick *ptr_nick;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -357,7 +357,7 @@ irc_completion_channel_nicks_hosts_cb (void *data, const char *completion_item,
char *buf;
int length;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
@@ -417,7 +417,7 @@ irc_completion_channel_topic_cb (void *data, const char *completion_item,
{
char *topic_color;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
src/plugins/irc/irc-input.c
+3 -3
View File
@@ -47,7 +47,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, const char *text)
text_decoded = irc_color_decode (text,
weechat_config_boolean (irc_config_network_colors_send));
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
if (ptr_channel)
{
@@ -82,7 +82,7 @@ irc_input_send_user_message (struct t_gui_buffer *buffer, char *text)
int max_length;
char *pos, *pos_max, *last_space, *pos_next, *next, saved_char;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
if (!ptr_server || !ptr_channel || !text || !text[0])
return;
@@ -147,7 +147,7 @@ irc_input_data_cb (void *data, struct t_gui_buffer *buffer,
const char *ptr_data;
char *data_with_colors, *msg;
IRC_GET_SERVER_CHANNEL(buffer);
IRC_BUFFER_GET_SERVER_CHANNEL(buffer);
/* make C compiler happy */
(void) data;
src/plugins/irc/irc.h
-18
View File
@@ -23,24 +23,6 @@
#define weechat_plugin weechat_irc_plugin
#define IRC_PLUGIN_NAME "irc"
#define IRC_GET_SERVER(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
irc_buffer_get_server_channel (__buffer, &ptr_server, NULL);
#define IRC_GET_SERVER_CHANNEL(__buffer) \
struct t_weechat_plugin *buffer_plugin = NULL; \
struct t_irc_server *ptr_server = NULL; \
struct t_irc_channel *ptr_channel = NULL; \
buffer_plugin = weechat_buffer_get_pointer (__buffer, "plugin"); \
if (buffer_plugin == weechat_irc_plugin) \
{ \
irc_buffer_get_server_channel (__buffer, &ptr_server, \
&ptr_channel); \
}
#define IRC_COLOR_CHAT weechat_color("chat")
#define IRC_COLOR_CHAT_CHANNEL weechat_color("chat_channel")
#define IRC_COLOR_CHAT_DELIMITERS weechat_color("chat_delimiters")