New "irc/debug" buffer (replaces old IRC raw buffer), improved status bar display, fixed nick in input for IRC buffers
The "irc/debug" buffer is displayed when IRC debug is enabled (with "/debug irc" thru debug plugin). If the buffer is closed, it is reopen when new messages are written, until debug is disabled by user (with "/debug irc").
This commit is contained in:
Sebastien Helleu
parent
3187d9627b
commit
c5a30be877
@ -101,6 +101,8 @@
|
||||
./src/plugins/irc/irc-config.h
|
||||
./src/plugins/irc/irc-dcc.c
|
||||
./src/plugins/irc/irc-dcc.h
|
||||
./src/plugins/irc/irc-debug.c
|
||||
./src/plugins/irc/irc-debug.h
|
||||
./src/plugins/irc/irc-display.c
|
||||
./src/plugins/irc/irc-display.h
|
||||
./src/plugins/irc/irc.h
|
||||
|
||||
44
po/cs.po
44
po/cs.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.7-dev\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+0100\n"
|
||||
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
|
||||
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1089,7 +1089,15 @@ msgid "text color for status bar delimiters"
|
||||
msgstr "barva děličů status barů"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current channel in status bar"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr "barva pro aktuální kanál v stavovém řádku"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr "barva pro aktuální kanál v stavovém řádku"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr "barva pro aktuální kanál v stavovém řádku"
|
||||
|
||||
#, fuzzy
|
||||
@ -1599,9 +1607,6 @@ msgstr "skoč na buffer s aktivitou"
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr "skoč na DCC buffer"
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr "skočit na čistý IRC data buffer"
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr "skoč na poslední buffer"
|
||||
|
||||
@ -1940,14 +1945,6 @@ msgstr "%s chyba při čtení FIFO roury, zavírám ji\n"
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr "%s chyba při čtení FIFO roury, zavírám ji\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO roura je otevřena\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr "%s nemohu přidělit nový kanál"
|
||||
@ -3277,6 +3274,18 @@ msgstr "%s DCC: nemohu nastavit 'neblokovaci' volbu na soket\n"
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr "Ruším aktivní DCC: \"%s\" od %s\n"
|
||||
|
||||
#, fuzzy
|
||||
msgid "IRC debug messages"
|
||||
msgstr "vypsat debug zprávy"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO roura je otevřena\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr "%sServer: %s%s %s[%s%s%s]\n"
|
||||
@ -3939,6 +3948,9 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr "%s chyba při zasílání dat na IRC server\n"
|
||||
|
||||
msgid "(message dropped)"
|
||||
msgstr "(zpráva zahozena)"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr "%s nedostatek paměti pro získání IRC zprávy\n"
|
||||
@ -4337,6 +4349,9 @@ msgstr ""
|
||||
msgid "%s%s: wrong arguments for function \"%s\""
|
||||
msgstr "%s špatné parametry pro příkaz \"%s\"\n"
|
||||
|
||||
#~ msgid "jump to raw IRC data buffer"
|
||||
#~ msgstr "skočit na čistý IRC data buffer"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "debug command"
|
||||
#~ msgstr "příkaz"
|
||||
@ -4822,9 +4837,6 @@ msgstr "%s špatné parametry pro příkaz \"%s\"\n"
|
||||
#~ msgid "Unable to get user's name"
|
||||
#~ msgstr "Nemůžu získat jméno uživatele"
|
||||
|
||||
#~ msgid "(message dropped)"
|
||||
#~ msgstr "(zpráva zahozena)"
|
||||
|
||||
#~ msgid "%s Command \"%s\" failed!\n"
|
||||
#~ msgstr "%s Příkaz \"%s\" selhal\n"
|
||||
|
||||
|
||||
44
po/de.po
44
po/de.po
@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.7-dev\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+0100\n"
|
||||
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
|
||||
"Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1082,7 +1082,15 @@ msgid "text color for status bar delimiters"
|
||||
msgstr "Farbe der Statuszeilen-Separatoren"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current channel in status bar"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr "Farbe des aktuellen Channels in der Statuszeile"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr "Farbe des aktuellen Channels in der Statuszeile"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr "Farbe des aktuellen Channels in der Statuszeile"
|
||||
|
||||
#, fuzzy
|
||||
@ -1600,9 +1608,6 @@ msgstr "zu nächstem aktiven Puffer springen"
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr "zum DCC-Puffer springen"
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr "gehe zum IRC-Rohdaten-Puffer"
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr "zum letzten Puffer springen"
|
||||
|
||||
@ -1943,14 +1948,6 @@ msgstr "%s Fehler beim Lesen vom FIFO, FIFO wird geschlossen\n"
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr "%s Fehler beim Lesen vom FIFO, FIFO wird geschlossen\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO ist offen\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr "%s Neuer Channel konnte nicht alloziert werden"
|
||||
@ -3265,6 +3262,18 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n"
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr "Aktiver DCC wird abgebrochen: \"%s\" von %s\n"
|
||||
|
||||
#, fuzzy
|
||||
msgid "IRC debug messages"
|
||||
msgstr "Debugging-Nachricht ausgeben"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO ist offen\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr "%sServer: %s%s %s[%s%s%s]\n"
|
||||
@ -3930,6 +3939,9 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr "%s Fehler beim Senden von Daten an den IRC-Server\n"
|
||||
|
||||
msgid "(message dropped)"
|
||||
msgstr "(Nachricht verworfen)"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr "%s nicht genügend Speicher zum Empfangen der IRC-Nachricht vorhanden\n"
|
||||
@ -4330,6 +4342,9 @@ msgstr ""
|
||||
msgid "%s%s: wrong arguments for function \"%s\""
|
||||
msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
|
||||
|
||||
#~ msgid "jump to raw IRC data buffer"
|
||||
#~ msgstr "gehe zum IRC-Rohdaten-Puffer"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "debug command"
|
||||
#~ msgstr "Befehl"
|
||||
@ -4817,9 +4832,6 @@ msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
|
||||
#~ msgid "Unable to get user's name"
|
||||
#~ msgstr "Username konnte nicht ermittelt werden"
|
||||
|
||||
#~ msgid "(message dropped)"
|
||||
#~ msgstr "(Nachricht verworfen)"
|
||||
|
||||
#~ msgid "%s Command \"%s\" failed!\n"
|
||||
#~ msgstr "%s der Befehl \"%s\" schlug fehl!\n"
|
||||
|
||||
|
||||
46
po/es.po
46
po/es.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.7-dev\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+0100\n"
|
||||
"PO-Revision-Date: 2007-09-19 12:09+0200\n"
|
||||
"Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1073,7 +1073,15 @@ msgid "text color for status bar delimiters"
|
||||
msgstr "color para los delimitadores de la barra de estado"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current channel in status bar"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr "color para el canal actual en la barra de estado"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr "color para el canal actual en la barra de estado"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr "color para el canal actual en la barra de estado"
|
||||
|
||||
#, fuzzy
|
||||
@ -1590,9 +1598,6 @@ msgstr "saltar al búfer con actividad"
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr "saltar al búfer DCC"
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr "saltar al búfer de datos basura de IRC"
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr "saltar al último búfer"
|
||||
|
||||
@ -1931,14 +1936,6 @@ msgstr "%s error al leer la tuberÃa FIFO, cerrándola\n"
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr "%s error al leer la tuberÃa FIFO, cerrándola\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "La tuberÃa FIFO está abierta\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr "%s no ha sido posible crear un nuevo canal"
|
||||
@ -3270,6 +3267,18 @@ msgstr "%s no es posible crear el servidor\n"
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr "Abandonar el DCC activo: \"%s\" de %s\n"
|
||||
|
||||
#, fuzzy
|
||||
msgid "IRC debug messages"
|
||||
msgstr "imprime mensajes de depuración"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "La tuberÃa FIFO está abierta\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr "%sServidor:%s%s %s[%s%s%s]\n"
|
||||
@ -3941,6 +3950,10 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr "%s error enviando datos al servidor IRC\n"
|
||||
|
||||
#, fuzzy
|
||||
msgid "(message dropped)"
|
||||
msgstr "mensaje recibido"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr "%s memoria insuficiente para un mensaje IRC recibido\n"
|
||||
@ -4342,6 +4355,9 @@ msgstr ""
|
||||
msgid "%s%s: wrong arguments for function \"%s\""
|
||||
msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
|
||||
|
||||
#~ msgid "jump to raw IRC data buffer"
|
||||
#~ msgstr "saltar al búfer de datos basura de IRC"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "debug command"
|
||||
#~ msgstr "comando"
|
||||
@ -4835,10 +4851,6 @@ msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
|
||||
#~ msgid "Unable to get user's name"
|
||||
#~ msgstr "No ha sido posible obtener el nombre de usuario"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "(message dropped)"
|
||||
#~ msgstr "mensaje recibido"
|
||||
|
||||
#~ msgid "%s Command \"%s\" failed!\n"
|
||||
#~ msgstr "%s ¡El comando \"%s\" ha fallado!\n"
|
||||
|
||||
|
||||
44
po/fr.po
44
po/fr.po
@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.7-dev\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"PO-Revision-Date: 2008-02-21 07:55+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+0100\n"
|
||||
"PO-Revision-Date: 2008-02-22 14:18+0100\n"
|
||||
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -1021,8 +1021,16 @@ msgstr "couleur du fond pour la barre de statut"
|
||||
msgid "text color for status bar delimiters"
|
||||
msgstr "couleur du texte pour les délimiteurs de la barre de statut"
|
||||
|
||||
msgid "text color for current channel in status bar"
|
||||
msgstr "couleur du texte pour le canal courant dans la barre de statut"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr ""
|
||||
"couleur du texte pour le numéro du tampon courant dans la barre de statut"
|
||||
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr ""
|
||||
"couleur du texte pour la catégorie du tampon courant dans la barre de statut"
|
||||
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr "couleur du texte pour le nom du tampon courant dans la barre de statut"
|
||||
|
||||
msgid "text color for buffer with new messages (status bar)"
|
||||
msgstr ""
|
||||
@ -1503,9 +1511,6 @@ msgstr "sauter au tampon avec de l'activité"
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr "sauter au tampon DCC"
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr "sauter au tampon IRC brut"
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr "sauter au dernier tampon"
|
||||
|
||||
@ -1849,14 +1854,6 @@ msgstr "%s%s: erreur en lecture du tube, fermeture"
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr "%s%s: erreur d'ouverture du fichier, fermeture"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "%s: debug activé"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr "%s: debug désactivé"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr "%s%s: impossible d'allouer un nouveau canal"
|
||||
@ -3197,6 +3194,17 @@ msgstr "%s DCC: impossible d'activer l'option 'nonblock' sur la socket\n"
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr "Abandon du DCC actif: \"%s\" de %s"
|
||||
|
||||
msgid "IRC debug messages"
|
||||
msgstr "Messages de debug IRC"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "%s: debug activé"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr "%s: debug désactivé"
|
||||
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr "%sServeur: %s%s %s[%s%s%s]"
|
||||
@ -3864,6 +3872,9 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr "%s%s: erreur d'envoi de données au serveur IRC (%s)"
|
||||
|
||||
msgid "(message dropped)"
|
||||
msgstr "(message supprimé)"
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr "%s%s: mémoire insuffisante pour un message IRC reçu"
|
||||
@ -4275,6 +4286,9 @@ msgstr ""
|
||||
msgid "%s%s: wrong arguments for function \"%s\""
|
||||
msgstr "%s%s: paramètres invalides pour la fonction \"%s\""
|
||||
|
||||
#~ msgid "jump to raw IRC data buffer"
|
||||
#~ msgstr "sauter au tampon IRC brut"
|
||||
|
||||
#~ msgid "debug command"
|
||||
#~ msgstr "commande debug"
|
||||
|
||||
|
||||
44
po/hu.po
44
po/hu.po
@ -12,7 +12,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.7-dev\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+0100\n"
|
||||
"PO-Revision-Date: 2007-10-10 18:07+0200\n"
|
||||
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1091,7 +1091,15 @@ msgid "text color for status bar delimiters"
|
||||
msgstr "státuszsor határolójel színe"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current channel in status bar"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr "aktuális szoba színe a státuszsorban"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr "aktuális szoba színe a státuszsorban"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr "aktuális szoba színe a státuszsorban"
|
||||
|
||||
#, fuzzy
|
||||
@ -1603,9 +1611,6 @@ msgstr "ugrás aktív pufferre"
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr "ugrás a DCC pufferre"
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr "ugrás a nyers IRC adat pufferre"
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr "ugrás az utolsó pufferre"
|
||||
|
||||
@ -1947,14 +1952,6 @@ msgstr "%s hiba a FIFO cső olvasása közben, bezárás\n"
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr "%s hiba a FIFO cső olvasása közben, bezárás\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO cső nyitva\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr "%s nem sikerült új csatornát lefoglalni"
|
||||
@ -3283,6 +3280,18 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n"
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr "\"%s\" aktív DCC megszakítása a következővel: %s\n"
|
||||
|
||||
#, fuzzy
|
||||
msgid "IRC debug messages"
|
||||
msgstr "hibakereső üzenetek megjelenítése"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO cső nyitva\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
|
||||
@ -3941,6 +3950,9 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr "%s adatküldési hiba az IRC szerveren\n"
|
||||
|
||||
msgid "(message dropped)"
|
||||
msgstr "(üzenet eldobva)"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr "%s nincs elegendő memória a fogadott IRC üzenet számára\n"
|
||||
@ -4345,6 +4357,9 @@ msgstr ""
|
||||
msgid "%s%s: wrong arguments for function \"%s\""
|
||||
msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
|
||||
|
||||
#~ msgid "jump to raw IRC data buffer"
|
||||
#~ msgstr "ugrás a nyers IRC adat pufferre"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "debug command"
|
||||
#~ msgstr "parancs"
|
||||
@ -4820,9 +4835,6 @@ msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
|
||||
#~ msgid "Unable to get user's name"
|
||||
#~ msgstr "A felhasználónév meghatározása sikertelen"
|
||||
|
||||
#~ msgid "(message dropped)"
|
||||
#~ msgstr "(üzenet eldobva)"
|
||||
|
||||
#~ msgid "%s Command \"%s\" failed!\n"
|
||||
#~ msgstr "%s Parancs \"%s\" sikertelen!\n"
|
||||
|
||||
|
||||
44
po/ru.po
44
po/ru.po
@ -6,7 +6,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: WeeChat 0.2.7-dev\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+0100\n"
|
||||
"PO-Revision-Date: 2007-09-06 12:44+0200\n"
|
||||
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
|
||||
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
|
||||
@ -1093,7 +1093,15 @@ msgid "text color for status bar delimiters"
|
||||
msgstr "цвет разделителей строки состояния"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current channel in status bar"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr "цвет текущего канала в строке состояния"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr "цвет текущего канала в строке состояния"
|
||||
|
||||
#, fuzzy
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr "цвет текущего канала в строке состояния"
|
||||
|
||||
#, fuzzy
|
||||
@ -1605,9 +1613,6 @@ msgstr "перейти к буферу с активностью:"
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr "перейти к буферу DCC"
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr "перейти к буферу сырых данных IRC"
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr "перейти к последнему буферу"
|
||||
|
||||
@ -1949,14 +1954,6 @@ msgstr "%s ошибка чтения FIFO pipe, закрываю его\n"
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr "%s ошибка чтения FIFO pipe, закрываю его\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO pipe открыт\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr "%s не могу расположить новый канал"
|
||||
@ -3271,6 +3268,18 @@ msgstr "%s DCC: не могу установить неблокирующий р
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr "Отменяю активное DCC-сединение: \"%s\" от %s\n"
|
||||
|
||||
#, fuzzy
|
||||
msgid "IRC debug messages"
|
||||
msgstr "выводить отладочные сообщения"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr "FIFO pipe открыт\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
|
||||
@ -3928,6 +3937,9 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr "%s ошибка при отправке данных IRC серверу\n"
|
||||
|
||||
msgid "(message dropped)"
|
||||
msgstr "(сообщение отброшено)"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr "%s недостаточно памяти для полученного сообщения\n"
|
||||
@ -4327,6 +4339,9 @@ msgstr ""
|
||||
msgid "%s%s: wrong arguments for function \"%s\""
|
||||
msgstr "%s некорректные аргументы команды \"%s\"\n"
|
||||
|
||||
#~ msgid "jump to raw IRC data buffer"
|
||||
#~ msgstr "перейти к буферу сырых данных IRC"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "debug command"
|
||||
#~ msgstr "команда"
|
||||
@ -4808,9 +4823,6 @@ msgstr "%s некорректные аргументы команды \"%s\"\n"
|
||||
#~ msgid "Unable to get user's name"
|
||||
#~ msgstr "Не могу получить имя пользователя"
|
||||
|
||||
#~ msgid "(message dropped)"
|
||||
#~ msgstr "(сообщение отброшено)"
|
||||
|
||||
#~ msgid "%s Command \"%s\" failed!\n"
|
||||
#~ msgstr "%s Команда \"%s\" не удалась!\n"
|
||||
|
||||
|
||||
@ -102,6 +102,8 @@ SET(WEECHAT_SOURCES
|
||||
./src/plugins/irc/irc-config.h
|
||||
./src/plugins/irc/irc-dcc.c
|
||||
./src/plugins/irc/irc-dcc.h
|
||||
./src/plugins/irc/irc-debug.c
|
||||
./src/plugins/irc/irc-debug.h
|
||||
./src/plugins/irc/irc-display.c
|
||||
./src/plugins/irc/irc-display.h
|
||||
./src/plugins/irc/irc.h
|
||||
|
||||
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
|
||||
"POT-Creation-Date: 2008-02-21 07:54+0100\n"
|
||||
"POT-Creation-Date: 2008-02-22 14:17+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"
|
||||
@ -864,7 +864,13 @@ msgstr ""
|
||||
msgid "text color for status bar delimiters"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for current channel in status bar"
|
||||
msgid "text color for current buffer number in status bar"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for current buffer category in status bar"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for current buffer name in status bar"
|
||||
msgstr ""
|
||||
|
||||
msgid "text color for buffer with new messages (status bar)"
|
||||
@ -1313,9 +1319,6 @@ msgstr ""
|
||||
msgid "jump to DCC buffer"
|
||||
msgstr ""
|
||||
|
||||
msgid "jump to raw IRC data buffer"
|
||||
msgstr ""
|
||||
|
||||
msgid "jump to last buffer"
|
||||
msgstr ""
|
||||
|
||||
@ -1621,14 +1624,6 @@ msgstr ""
|
||||
msgid "%s%s: error opening file, closing it"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: cannot allocate new channel"
|
||||
msgstr ""
|
||||
@ -2751,6 +2746,17 @@ msgstr ""
|
||||
msgid "Aborting active DCC: \"%s\" from %s"
|
||||
msgstr ""
|
||||
|
||||
msgid "IRC debug messages"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug enabled"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: debug disabled"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%sServer: %s%s %s[%s%s%s]"
|
||||
msgstr ""
|
||||
@ -3403,6 +3409,9 @@ msgstr ""
|
||||
msgid "%s%s: error sending data to IRC server (%s)"
|
||||
msgstr ""
|
||||
|
||||
msgid "(message dropped)"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s%s: not enough memory for received IRC message"
|
||||
msgstr ""
|
||||
|
||||
@ -124,7 +124,9 @@ struct t_config_option *config_color_chat_read_marker_bg;
|
||||
struct t_config_option *config_color_status;
|
||||
struct t_config_option *config_color_status_bg;
|
||||
struct t_config_option *config_color_status_delimiters;
|
||||
struct t_config_option *config_color_status_channel;
|
||||
struct t_config_option *config_color_status_number;
|
||||
struct t_config_option *config_color_status_category;
|
||||
struct t_config_option *config_color_status_name;
|
||||
struct t_config_option *config_color_status_data_msg;
|
||||
struct t_config_option *config_color_status_data_private;
|
||||
struct t_config_option *config_color_status_data_highlight;
|
||||
@ -973,11 +975,21 @@ config_weechat_init ()
|
||||
"color_status_delimiters", "color",
|
||||
N_("text color for status bar delimiters"),
|
||||
NULL, GUI_COLOR_STATUS_DELIMITERS, 0, "cyan", &config_change_color, NULL);
|
||||
config_color_status_channel = config_file_new_option (
|
||||
config_color_status_number = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"color_status_channel", "color",
|
||||
N_("text color for current channel in status bar"),
|
||||
NULL, GUI_COLOR_STATUS_CHANNEL, 0, "white", &config_change_color, NULL);
|
||||
"color_status_number", "color",
|
||||
N_("text color for current buffer number in status bar"),
|
||||
NULL, GUI_COLOR_STATUS_NUMBER, 0, "yellow", &config_change_color, NULL);
|
||||
config_color_status_category = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"color_status_category", "color",
|
||||
N_("text color for current buffer category in status bar"),
|
||||
NULL, GUI_COLOR_STATUS_CATEGORY, 0, "lightgreen", &config_change_color, NULL);
|
||||
config_color_status_name = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"color_status_name", "color",
|
||||
N_("text color for current buffer name in status bar"),
|
||||
NULL, GUI_COLOR_STATUS_NAME, 0, "white", &config_change_color, NULL);
|
||||
config_color_status_data_msg = config_file_new_option (
|
||||
weechat_config_file, ptr_section,
|
||||
"color_status_data_msg", "color",
|
||||
|
||||
@ -110,7 +110,9 @@ extern struct t_config_option *config_color_chat_read_marker_bg;
|
||||
extern struct t_config_option *config_color_status;
|
||||
extern struct t_config_option *config_color_status_bg;
|
||||
extern struct t_config_option *config_color_status_delimiters;
|
||||
extern struct t_config_option *config_color_status_channel;
|
||||
extern struct t_config_option *config_color_status_number;
|
||||
extern struct t_config_option *config_color_status_category;
|
||||
extern struct t_config_option *config_color_status_name;
|
||||
extern struct t_config_option *config_color_status_data_msg;
|
||||
extern struct t_config_option *config_color_status_data_private;
|
||||
extern struct t_config_option *config_color_status_data_highlight;
|
||||
|
||||
@ -378,7 +378,9 @@ gui_color_init_weechat ()
|
||||
|
||||
gui_color[GUI_COLOR_STATUS] = gui_color_build (GUI_COLOR_STATUS, CONFIG_COLOR(config_color_status), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_DELIMITERS] = gui_color_build (GUI_COLOR_STATUS_DELIMITERS, CONFIG_COLOR(config_color_status_delimiters), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_CHANNEL] = gui_color_build (GUI_COLOR_STATUS_CHANNEL, CONFIG_COLOR(config_color_status_channel), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_NUMBER] = gui_color_build (GUI_COLOR_STATUS_NAME, CONFIG_COLOR(config_color_status_number), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_CATEGORY] = gui_color_build (GUI_COLOR_STATUS_NAME, CONFIG_COLOR(config_color_status_category), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_NAME] = gui_color_build (GUI_COLOR_STATUS_NAME, CONFIG_COLOR(config_color_status_name), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_DATA_MSG] = gui_color_build (GUI_COLOR_STATUS_DATA_MSG, CONFIG_COLOR(config_color_status_data_msg), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_DATA_PRIVATE] = gui_color_build (GUI_COLOR_STATUS_DATA_PRIVATE, CONFIG_COLOR(config_color_status_data_private), CONFIG_COLOR(config_color_status_bg));
|
||||
gui_color[GUI_COLOR_STATUS_DATA_HIGHLIGHT] = gui_color_build (GUI_COLOR_STATUS_DATA_HIGHLIGHT, CONFIG_COLOR(config_color_status_data_highlight), CONFIG_COLOR(config_color_status_bg));
|
||||
|
||||
@ -106,7 +106,6 @@ gui_keyboard_default_bindings ()
|
||||
gui_keyboard_bind (/* m-j,m-d */ "meta-jmeta-d", "jump_dcc");
|
||||
gui_keyboard_bind (/* m-j,m-l */ "meta-jmeta-l", "jump_last_buffer");
|
||||
gui_keyboard_bind (/* m-j,m-p */ "meta-jmeta-p", "jump_previous_buffer");
|
||||
gui_keyboard_bind (/* m-j,m-r */ "meta-jmeta-r", "jump_raw_data");
|
||||
gui_keyboard_bind (/* m-j,m-s */ "meta-jmeta-s", "jump_server");
|
||||
gui_keyboard_bind (/* m-j,m-x */ "meta-jmeta-x", "jump_next_server");
|
||||
gui_keyboard_bind (/* m-k */ "meta-k", "grab_key");
|
||||
|
||||
@ -77,41 +77,33 @@ gui_status_draw (int erase)
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
|
||||
|
||||
/* display buffer plugin */
|
||||
if (ptr_win->buffer->plugin)
|
||||
{
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "[");
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
|
||||
ptr_win->buffer->plugin->name);
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_DELIMITERS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
|
||||
}
|
||||
|
||||
/* display buffer category */
|
||||
if (ptr_win->buffer->category)
|
||||
{
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "[");
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
|
||||
ptr_win->buffer->category);
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_DELIMITERS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
|
||||
}
|
||||
|
||||
/* display buffer name */
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "[");
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
|
||||
(ptr_win->buffer->plugin) ?
|
||||
ptr_win->buffer->plugin->name : "core");
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_DELIMITERS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
|
||||
|
||||
/* display buffer number/category/name */
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_NUMBER);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
|
||||
ptr_win->buffer->number);
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_DELIMITERS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, ":");
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_CHANNEL);
|
||||
GUI_COLOR_STATUS_CATEGORY);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
|
||||
ptr_win->buffer->category);
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_DELIMITERS);
|
||||
wprintw (GUI_CURSES(ptr_win)->win_status, "/");
|
||||
gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
|
||||
GUI_COLOR_STATUS_NAME);
|
||||
gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s ",
|
||||
ptr_win->buffer->name);
|
||||
|
||||
|
||||
@ -1149,35 +1149,6 @@ gui_action_jump_dcc (char *args)
|
||||
}*/
|
||||
}
|
||||
|
||||
/*
|
||||
* gui_action_jump_raw_data: jump to raw IRC data buffer
|
||||
*/
|
||||
|
||||
void
|
||||
gui_action_jump_raw_data (char *args)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) args;
|
||||
|
||||
/*if (gui_current_window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
|
||||
{
|
||||
if (gui_current_window->buffer->type == GUI_BUFFER_TYPE_RAW_DATA)
|
||||
{
|
||||
if (gui_buffer_before_raw_data)
|
||||
{
|
||||
gui_window_switch_to_buffer (window,
|
||||
gui_buffer_before_raw_data);
|
||||
gui_window_redraw_buffer (gui_current_window->buffer);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
gui_buffer_before_raw_data = buffer;
|
||||
gui_buffer_switch_raw_data (window);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
/*
|
||||
* gui_action_jump_last_buffer: jump to last buffer
|
||||
*/
|
||||
|
||||
@ -59,7 +59,6 @@ extern void gui_action_nick_page_up (char *args);
|
||||
extern void gui_action_nick_page_down (char *args);
|
||||
extern void gui_action_jump_smart (char *args);
|
||||
extern void gui_action_jump_dcc (char *args);
|
||||
extern void gui_action_jump_raw_data (char *args);
|
||||
extern void gui_action_jump_last_buffer (char *args);
|
||||
extern void gui_action_jump_previous_buffer (char *args);
|
||||
extern void gui_action_jump_server (char *args);
|
||||
|
||||
@ -56,8 +56,6 @@ struct t_gui_buffer *gui_buffers = NULL; /* first buffer */
|
||||
struct t_gui_buffer *last_gui_buffer = NULL; /* last buffer */
|
||||
struct t_gui_buffer *gui_previous_buffer = NULL; /* previous buffer */
|
||||
struct t_gui_buffer *gui_buffer_before_dcc = NULL; /* buffer before dcc */
|
||||
struct t_gui_buffer *gui_buffer_raw_data = NULL; /* buffer with raw data */
|
||||
struct t_gui_buffer *gui_buffer_before_raw_data = NULL; /* buf. before raw */
|
||||
|
||||
|
||||
/*
|
||||
@ -656,15 +654,6 @@ gui_buffer_close (struct t_gui_buffer *buffer, int switch_to_another)
|
||||
if (gui_buffer_before_dcc == buffer)
|
||||
gui_buffer_before_dcc = NULL;
|
||||
|
||||
if (gui_buffer_before_raw_data == buffer)
|
||||
gui_buffer_before_raw_data = NULL;
|
||||
|
||||
if (buffer->type == GUI_BUFFER_TYPE_FREE)
|
||||
{
|
||||
// TODO: review this
|
||||
gui_buffer_raw_data = NULL;
|
||||
}
|
||||
|
||||
/* free title */
|
||||
if (buffer->title)
|
||||
free (buffer->title);
|
||||
@ -791,32 +780,6 @@ gui_buffer_switch_dcc (struct t_gui_window *window)
|
||||
NULL, NULL, GUI_BUFFER_TYPE_DCC, 1);*/
|
||||
}
|
||||
|
||||
/*
|
||||
* gui_buffer_switch_raw_data: switch to rax IRC data buffer (create it if it does not exist)
|
||||
*/
|
||||
|
||||
void
|
||||
gui_buffer_switch_raw_data (struct t_gui_window *window)
|
||||
{
|
||||
//struct t_gui_buffer *ptr_buffer;
|
||||
|
||||
(void) window;
|
||||
/* check if raw IRC data buffer exists */
|
||||
/*for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
|
||||
{
|
||||
if (ptr_buffer->type == GUI_BUFFER_TYPE_RAW_DATA)
|
||||
break;
|
||||
}
|
||||
if (ptr_buffer)
|
||||
{
|
||||
gui_window_switch_to_buffer (window, ptr_buffer);
|
||||
gui_window_redraw_buffer (ptr_buffer);
|
||||
}
|
||||
else
|
||||
gui_buffer_new (window, weechat_protocols,
|
||||
NULL, NULL, GUI_BUFFER_TYPE_RAW_DATA, 1);*/
|
||||
}
|
||||
|
||||
/*
|
||||
* gui_buffer_switch_by_number: switch to another buffer with number
|
||||
*/
|
||||
|
||||
@ -133,8 +133,6 @@ extern struct t_gui_buffer *gui_buffers;
|
||||
extern struct t_gui_buffer *last_gui_buffer;
|
||||
extern struct t_gui_buffer *gui_previous_buffer;
|
||||
extern struct t_gui_buffer *gui_buffer_before_dcc;
|
||||
extern struct t_gui_buffer *gui_buffer_raw_data;
|
||||
extern struct t_gui_buffer *gui_buffer_before_raw_data;
|
||||
|
||||
/* buffer functions */
|
||||
|
||||
@ -175,7 +173,6 @@ extern void gui_buffer_close (struct t_gui_buffer *buffer,
|
||||
extern void gui_buffer_switch_previous (struct t_gui_window *window);
|
||||
extern void gui_buffer_switch_next (struct t_gui_window *window);
|
||||
extern void gui_buffer_switch_dcc (struct t_gui_window *window);
|
||||
extern void gui_buffer_switch_raw_data (struct t_gui_window *window);
|
||||
extern void gui_buffer_switch_by_number (struct t_gui_window *window,
|
||||
int number);
|
||||
extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number);
|
||||
|
||||
@ -580,49 +580,3 @@ gui_chat_printf_date (struct t_gui_buffer *buffer, time_t date,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* gui_chat_printf_raw_data: display raw IRC data (only if raw IRC data buffer
|
||||
* exists)
|
||||
* type: 0 = recv, 1 = send, -1 = recv, modified by
|
||||
* a modifier (plugin)
|
||||
*/
|
||||
|
||||
void
|
||||
gui_chat_printf_raw_data (void *server, int send, int modified, char *message)
|
||||
{
|
||||
(void) server;
|
||||
(void) send;
|
||||
(void) modified;
|
||||
(void) message;
|
||||
|
||||
/* char *pos;
|
||||
|
||||
if (gui_buffer_raw_data)
|
||||
{
|
||||
while (message && message[0])
|
||||
{
|
||||
pos = strstr (message, "\r\n");
|
||||
if (pos)
|
||||
pos[0] = '\0';
|
||||
gui_printf_nolog (gui_buffer_raw_data,
|
||||
"%s[%s%s%s] %s%s%s %s\n",
|
||||
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
|
||||
GUI_COLOR(GUI_COLOR_WIN_CHAT_SERVER),
|
||||
((t_irc_server *)server)->name,
|
||||
GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
|
||||
GUI_COLOR((send) ? GUI_COLOR_WIN_CHAT_PART : GUI_COLOR_WIN_CHAT_JOIN),
|
||||
(send) ? ((modified) ? GUI_PREFIX_SEND_MOD : GUI_PREFIX_PART) :
|
||||
((modified) ? GUI_PREFIX_RECV_MOD : GUI_PREFIX_JOIN),
|
||||
GUI_COLOR(GUI_COLOR_CHAT),
|
||||
message);
|
||||
if (pos)
|
||||
{
|
||||
pos[0] = '\r';
|
||||
message = pos + 2;
|
||||
}
|
||||
else
|
||||
message = NULL;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
@ -63,8 +63,6 @@ extern int gui_chat_line_search (struct t_gui_line *line, char *text,
|
||||
extern void gui_chat_line_free (struct t_gui_line *line);
|
||||
extern void gui_chat_printf_date (struct t_gui_buffer *buffer, time_t date,
|
||||
char *message, ...);
|
||||
extern void gui_chat_printf_raw_data (void *server, int send, int modified,
|
||||
char *message);
|
||||
|
||||
/* chat functions (GUI dependent) */
|
||||
|
||||
|
||||
@ -63,7 +63,9 @@ enum t_gui_color_enum
|
||||
|
||||
GUI_COLOR_STATUS,
|
||||
GUI_COLOR_STATUS_DELIMITERS,
|
||||
GUI_COLOR_STATUS_CHANNEL,
|
||||
GUI_COLOR_STATUS_NUMBER,
|
||||
GUI_COLOR_STATUS_CATEGORY,
|
||||
GUI_COLOR_STATUS_NAME,
|
||||
GUI_COLOR_STATUS_DATA_MSG,
|
||||
GUI_COLOR_STATUS_DATA_PRIVATE,
|
||||
GUI_COLOR_STATUS_DATA_HIGHLIGHT,
|
||||
|
||||
@ -473,54 +473,3 @@ gui_exec_action_dcc (struct t_gui_window *window, char *actions)
|
||||
actions = utf8_next_char (actions);
|
||||
}*/
|
||||
}
|
||||
|
||||
/*
|
||||
* gui_exec_action_raw_data: execute an action on raw IRC data
|
||||
* return -1 if raw IRC data was closed due to action,
|
||||
* 0 otherwise
|
||||
*/
|
||||
|
||||
void
|
||||
gui_exec_action_raw_data (struct t_gui_window *window, char *actions)
|
||||
{
|
||||
struct t_gui_window *ptr_win;
|
||||
struct t_gui_buffer *ptr_buffer;
|
||||
|
||||
while (actions[0])
|
||||
{
|
||||
if (actions[0] >= 32)
|
||||
{
|
||||
switch (actions[0])
|
||||
{
|
||||
/* close raw IRC data */
|
||||
case 'c':
|
||||
case 'C':
|
||||
gui_buffer_clear (window->buffer);
|
||||
gui_window_redraw_buffer (window->buffer);
|
||||
return;
|
||||
break;
|
||||
/* close raw IRC data */
|
||||
case 'q':
|
||||
case 'Q':
|
||||
if (gui_buffer_before_raw_data)
|
||||
{
|
||||
ptr_buffer = window->buffer;
|
||||
for (ptr_win = gui_windows; ptr_win;
|
||||
ptr_win = ptr_win->next_window)
|
||||
{
|
||||
if (ptr_win->buffer == ptr_buffer)
|
||||
gui_window_switch_to_buffer (ptr_win,
|
||||
gui_buffer_before_raw_data);
|
||||
}
|
||||
gui_buffer_close (ptr_buffer, 0);
|
||||
}
|
||||
else
|
||||
gui_buffer_close (window->buffer, 1);
|
||||
gui_window_redraw_buffer (window->buffer);
|
||||
return;
|
||||
break;
|
||||
}
|
||||
}
|
||||
actions = utf8_next_char (actions);
|
||||
}
|
||||
}
|
||||
|
||||
@ -130,8 +130,6 @@ struct t_gui_key_function gui_key_functions[] =
|
||||
N_("jump to buffer with activity") },
|
||||
{ "jump_dcc", gui_action_jump_dcc,
|
||||
N_("jump to DCC buffer") },
|
||||
{ "jump_raw_data", gui_action_jump_raw_data,
|
||||
N_("jump to raw IRC data buffer") },
|
||||
{ "jump_last_buffer", gui_action_jump_last_buffer,
|
||||
N_("jump to last buffer") },
|
||||
{ "jump_previous_buffer", gui_action_jump_previous_buffer,
|
||||
|
||||
@ -14,15 +14,11 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
SET(LIB_PROTOCOL_IRC_SRC irc.c irc.h irc-channel.c irc-channel.h irc-command.c
|
||||
irc-command.h irc-completion.c irc-completion.h irc-config.c irc-config.h
|
||||
irc-server.c irc-server.h)
|
||||
|
||||
#SET(LIB_PROTOCOL_IRC_SRC irc.c irc.h irc-buffer.c irc-buffer.h irc-channel.c
|
||||
#irc-channel.h irc-command.c irc-command.h irc-completion.c irc-completion.h
|
||||
#irc-color.c irc-color.h irc-config.c irc-config.h irc-dcc.c irc-dcc.h
|
||||
#irc-display.c irc-input.c irc-log.c irc-mode.c irc-nick.c irc-nick.h
|
||||
#irc-protocol.c irc-protocol.h irc-server.c irc-server.h)
|
||||
SET(LIB_PROTOCOL_IRC_SRC irc.c irc.h irc-buffer.c irc-buffer.h irc-channel.c
|
||||
irc-channel.h irc-color.c irc-color.h irc-command.c irc-command.h
|
||||
irc-completion.c irc-completion.h irc-config.c irc-config.h irc-debug.c
|
||||
irc-debug.h irc-display.c irc-display.h irc-input.c irc-mode.c irc-mode.h
|
||||
irc-nick.c irc-nick.h irc-protocol.c irc-protocol.h irc-server.c irc-server.h)
|
||||
|
||||
CHECK_INCLUDE_FILES("regex.h" HAVE_REGEX_H)
|
||||
CHECK_FUNCTION_EXISTS(regexec HAVE_REGEXEC)
|
||||
|
||||
@ -34,6 +34,8 @@ irc_la_SOURCES = irc.c \
|
||||
irc-completion.h \
|
||||
irc-config.c \
|
||||
irc-config.h \
|
||||
irc-debug.c \
|
||||
irc-debug.h \
|
||||
irc-display.c \
|
||||
irc-display.h \
|
||||
irc-input.c \
|
||||
|
||||
@ -70,6 +70,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
|
||||
}
|
||||
if (channel_type == IRC_CHANNEL_TYPE_CHANNEL)
|
||||
{
|
||||
weechat_buffer_set (new_buffer, "nick", server->nick);
|
||||
weechat_buffer_set (new_buffer, "nicklist", "1");
|
||||
weechat_buffer_set (new_buffer, "nicklist_display_groups", "0");
|
||||
weechat_nicklist_add_group (new_buffer, NULL, IRC_NICK_GROUP_OP,
|
||||
|
||||
@ -1928,25 +1928,13 @@ irc_command_names (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
void
|
||||
irc_send_nick_server (struct t_irc_server *server, char *nickname)
|
||||
{
|
||||
struct t_irc_channel *ptr_channel;
|
||||
|
||||
if (!server)
|
||||
return;
|
||||
|
||||
if (server->is_connected)
|
||||
irc_server_sendf (server, "NICK %s", nickname);
|
||||
else
|
||||
{
|
||||
if (server->nick)
|
||||
free (server->nick);
|
||||
server->nick = strdup (nickname);
|
||||
//gui_input_draw (server->buffer, 1);
|
||||
for (ptr_channel = server->channels; ptr_channel;
|
||||
ptr_channel = ptr_channel->next_channel)
|
||||
{
|
||||
//gui_input_draw (ptr_channel->buffer, 1);
|
||||
}
|
||||
}
|
||||
irc_server_set_nick (server, nickname);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -1216,13 +1216,7 @@ irc_dcc_chat_sendf (struct t_irc_dcc *dcc, char *format, ...)
|
||||
buffer[sizeof (buffer) - 1] = '\0';
|
||||
if ((size_buf < 0) || (size_buf > (int) (sizeof (buffer) - 1)))
|
||||
size_buf = strlen (buffer);
|
||||
#ifdef DEBUG
|
||||
buffer[size_buf - 2] = '\0';
|
||||
gui_chat_printf (dcc->server->buffer,
|
||||
"[DEBUG] Sending to remote host (DCC CHAT) >>> %s\n",
|
||||
buffer);
|
||||
buffer[size_buf - 2] = '\r';
|
||||
#endif
|
||||
|
||||
if (irc_dcc_chat_send (dcc, buffer, strlen (buffer)) <= 0)
|
||||
{
|
||||
gui_chat_printf_error (dcc->server->buffer,
|
||||
|
||||
168
src/plugins/irc/irc-debug.c
Normal file
168
src/plugins/irc/irc-debug.c
Normal file
@ -0,0 +1,168 @@
|
||||
/*
|
||||
* Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
|
||||
* See README for License detail, AUTHORS for developers list.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/* irc-debug.c: debug functions for IRC plugin */
|
||||
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../weechat-plugin.h"
|
||||
#include "irc.h"
|
||||
#include "irc-debug.h"
|
||||
#include "irc-server.h"
|
||||
|
||||
|
||||
int irc_debug = 0;
|
||||
struct t_gui_buffer *irc_debug_buffer = NULL;
|
||||
|
||||
|
||||
/*
|
||||
* irc_debug_buffer_close_cb: callback called when IRC debug buffer is closed
|
||||
*/
|
||||
|
||||
int
|
||||
irc_debug_buffer_close_cb (void *data, struct t_gui_buffer *buffer)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
(void) buffer;
|
||||
|
||||
irc_debug_buffer = NULL;
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_debug_printf: print a message on IRC debug buffer
|
||||
*/
|
||||
|
||||
void
|
||||
irc_debug_printf (struct t_irc_server *server, int send, int modified,
|
||||
char *message)
|
||||
{
|
||||
char *buf;
|
||||
|
||||
if (!irc_debug || !message)
|
||||
return;
|
||||
|
||||
if (!irc_debug_buffer)
|
||||
{
|
||||
/* search for irc debug buffer */
|
||||
irc_debug_buffer = weechat_buffer_search ("irc", "debug");
|
||||
if (!irc_debug_buffer)
|
||||
{
|
||||
irc_debug_buffer = weechat_buffer_new ("irc", "debug",
|
||||
NULL, NULL,
|
||||
&irc_debug_buffer_close_cb, NULL);
|
||||
/* failed to create buffer ? then exit */
|
||||
if (!irc_debug_buffer)
|
||||
return;
|
||||
|
||||
weechat_buffer_set (irc_debug_buffer,
|
||||
"title", _("IRC debug messages"));
|
||||
}
|
||||
}
|
||||
|
||||
buf = weechat_iconv_to_internal (NULL, message);
|
||||
|
||||
weechat_printf (irc_debug_buffer,
|
||||
"%s%s%s%s%s\t%s",
|
||||
(server) ? weechat_color ("color_chat_server") : "",
|
||||
(server) ? server->name : "",
|
||||
(server) ? " " : "",
|
||||
(send) ?
|
||||
weechat_color ("color_chat_prefix_quit") :
|
||||
weechat_color ("color_chat_prefix_join"),
|
||||
(send) ?
|
||||
((modified) ? IRC_DEBUG_PREFIX_SEND_MOD : IRC_DEBUG_PREFIX_SEND) :
|
||||
((modified) ? IRC_DEBUG_PREFIX_RECV_MOD : IRC_DEBUG_PREFIX_RECV),
|
||||
(buf) ? buf : message);
|
||||
if (buf)
|
||||
free (buf);
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_debug_signal_debug_cb: callback for "debug" signal
|
||||
*/
|
||||
|
||||
int
|
||||
irc_debug_signal_debug_cb (void *data, char *signal, char *type_data,
|
||||
void *signal_data)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
(void) signal;
|
||||
|
||||
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
|
||||
{
|
||||
if (weechat_strcasecmp ((char *)signal_data, "irc") == 0)
|
||||
irc_debug ^= 1;
|
||||
}
|
||||
|
||||
if (irc_debug)
|
||||
weechat_printf (NULL, _("%s: debug enabled"), "irc");
|
||||
else
|
||||
weechat_printf (NULL, _("%s: debug disabled"), "irc");
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_debug_signal_debug_dump_cb: dump IRC data in WeeChat log file
|
||||
*/
|
||||
|
||||
int
|
||||
irc_debug_signal_debug_dump_cb (void *data, char *signal, char *type_data,
|
||||
void *signal_data)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
(void) signal;
|
||||
(void) type_data;
|
||||
(void) signal_data;
|
||||
|
||||
weechat_log_printf ("");
|
||||
weechat_log_printf ("***** \"%s\" plugin dump *****",
|
||||
weechat_plugin->name);
|
||||
|
||||
irc_server_print_log ();
|
||||
|
||||
//irc_dcc_print_log ();
|
||||
|
||||
weechat_log_printf ("");
|
||||
weechat_log_printf ("***** End of \"%s\" plugin dump *****",
|
||||
weechat_plugin->name);
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_debug_init: initialize debug for IRC plugin
|
||||
*/
|
||||
|
||||
void
|
||||
irc_debug_init ()
|
||||
{
|
||||
weechat_hook_signal ("debug", &irc_debug_signal_debug_cb, NULL);
|
||||
weechat_hook_signal ("debug_dump", &irc_debug_signal_debug_dump_cb, NULL);
|
||||
}
|
||||
34
src/plugins/irc/irc-debug.h
Normal file
34
src/plugins/irc/irc-debug.h
Normal file
@ -0,0 +1,34 @@
|
||||
/*
|
||||
* Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org>
|
||||
* See README for License detail, AUTHORS for developers list.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __WEECHAT_IRC_DEBUG_H
|
||||
#define __WEECHAT_IRC_DEBUG_H 1
|
||||
|
||||
#define IRC_DEBUG_PREFIX_RECV "-->"
|
||||
#define IRC_DEBUG_PREFIX_RECV_MOD "==>"
|
||||
#define IRC_DEBUG_PREFIX_SEND "<--"
|
||||
#define IRC_DEBUG_PREFIX_SEND_MOD "<=="
|
||||
|
||||
struct t_irc_server;
|
||||
|
||||
extern void irc_debug_printf (struct t_irc_server *server, int send,
|
||||
int modified, char *message);
|
||||
extern void irc_debug_init ();
|
||||
|
||||
#endif /* irc-debug.h */
|
||||
@ -1140,17 +1140,7 @@ irc_protocol_cmd_nick (struct t_irc_server *server, char *irc_message, char *hos
|
||||
}
|
||||
|
||||
if (strcmp (server->nick, nick) == 0)
|
||||
{
|
||||
free (server->nick);
|
||||
server->nick = strdup (arguments);
|
||||
|
||||
for (ptr_channel = server->channels; ptr_channel;
|
||||
ptr_channel = ptr_channel->next_channel)
|
||||
{
|
||||
weechat_buffer_set (ptr_channel->buffer, "nick",
|
||||
server->nick);
|
||||
}
|
||||
}
|
||||
irc_server_set_nick (server, arguments);
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
@ -2677,10 +2667,7 @@ irc_protocol_cmd_001 (struct t_irc_server *server, char *irc_message, char *host
|
||||
if (pos)
|
||||
pos[0] = '\0';
|
||||
if (strcmp (server->nick, arguments) != 0)
|
||||
{
|
||||
free (server->nick);
|
||||
server->nick = strdup (arguments);
|
||||
}
|
||||
irc_server_set_nick (server, arguments);
|
||||
|
||||
irc_protocol_cmd_server_msg (server, irc_message, host, nick, arguments,
|
||||
ignore, highlight);
|
||||
@ -5288,8 +5275,9 @@ irc_protocol_cmd_432 (struct t_irc_server *server, int argc, char **argv,
|
||||
"trying nickname #%d (\"%s\")"),
|
||||
weechat_prefix ("info"), "irc", server->nick,
|
||||
nick_to_use + 1, server->nicks_array[nick_to_use]);
|
||||
free (server->nick);
|
||||
server->nick = strdup (server->nicks_array[nick_to_use]);
|
||||
|
||||
irc_server_set_nick (server, server->nicks_array[nick_to_use]);
|
||||
|
||||
irc_server_sendf (server, "NICK %s", server->nick);
|
||||
}
|
||||
|
||||
@ -5343,8 +5331,9 @@ irc_protocol_cmd_433 (struct t_irc_server *server, int argc, char **argv,
|
||||
"trying nickname #%d (\"%s\")"),
|
||||
weechat_prefix ("info"), "irc", server->nick,
|
||||
nick_to_use + 1, server->nicks_array[nick_to_use]);
|
||||
free (server->nick);
|
||||
server->nick = strdup (server->nicks_array[nick_to_use]);
|
||||
|
||||
irc_server_set_nick (server, server->nicks_array[nick_to_use]);
|
||||
|
||||
irc_server_sendf (server, "NICK %s", server->nick);
|
||||
}
|
||||
else
|
||||
|
||||
@ -51,6 +51,7 @@
|
||||
#include "irc-channel.h"
|
||||
#include "irc-command.h"
|
||||
#include "irc-config.h"
|
||||
#include "irc-debug.h"
|
||||
#include "irc-nick.h"
|
||||
#include "irc-protocol.h"
|
||||
|
||||
@ -355,6 +356,28 @@ irc_server_set_nicks (struct t_irc_server *server, char *nicks)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_server_set_nick: set nickname for a server
|
||||
*/
|
||||
|
||||
void
|
||||
irc_server_set_nick (struct t_irc_server *server, char *nick)
|
||||
{
|
||||
struct t_irc_channel *ptr_channel;
|
||||
|
||||
if (server->nick)
|
||||
free (server->nick);
|
||||
server->nick = (nick) ? strdup (nick) : NULL;
|
||||
|
||||
weechat_buffer_set (server->buffer, "nick", nick);
|
||||
|
||||
for (ptr_channel = server->channels; ptr_channel;
|
||||
ptr_channel = ptr_channel->next_channel)
|
||||
{
|
||||
weechat_buffer_set (ptr_channel->buffer, "nick", nick);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_server_init_with_config_options: init a server with config options
|
||||
* (called when reading config file)
|
||||
@ -944,8 +967,8 @@ irc_server_outqueue_send (struct t_irc_server *server)
|
||||
pos = strchr (server->outqueue->message_before_mod, '\r');
|
||||
if (pos)
|
||||
pos[0] = '\0';
|
||||
//gui_chat_printf_raw_data (server, 1, 0,
|
||||
// server->outqueue->message_before_mod);
|
||||
irc_debug_printf (server, 1, 0,
|
||||
server->outqueue->message_before_mod);
|
||||
if (pos)
|
||||
pos[0] = '\r';
|
||||
}
|
||||
@ -954,8 +977,8 @@ irc_server_outqueue_send (struct t_irc_server *server)
|
||||
pos = strchr (server->outqueue->message_after_mod, '\r');
|
||||
if (pos)
|
||||
pos[0] = '\0';
|
||||
//gui_chat_printf_raw_data (server, 1, server->outqueue->modified,
|
||||
// server->outqueue->message_after_mod);
|
||||
irc_debug_printf (server, 1, server->outqueue->modified,
|
||||
server->outqueue->message_after_mod);
|
||||
if (pos)
|
||||
pos[0] = '\r';
|
||||
}
|
||||
@ -980,13 +1003,7 @@ irc_server_send_one_msg (struct t_irc_server *server, char *message)
|
||||
time_t time_now;
|
||||
|
||||
rc = 1;
|
||||
|
||||
if (irc_debug)
|
||||
{
|
||||
weechat_printf (server->buffer,
|
||||
"[DEBUG] Sending to server >>> %s",
|
||||
message);
|
||||
}
|
||||
|
||||
/*new_msg = plugin_modifier_exec (PLUGIN_MODIFIER_IRC_OUT,
|
||||
server->name,
|
||||
message)
|
||||
@ -1034,10 +1051,10 @@ irc_server_send_one_msg (struct t_irc_server *server, char *message)
|
||||
}
|
||||
else
|
||||
{
|
||||
//if (first_message)
|
||||
// gui_chat_printf_raw_data (server, 1, 0, message);
|
||||
//if (new_msg)
|
||||
// gui_chat_printf_raw_data (server, 1, 1, ptr_msg);
|
||||
if (first_message)
|
||||
irc_debug_printf (server, 1, 0, message);
|
||||
if (new_msg)
|
||||
irc_debug_printf (server, 1, 1, ptr_msg);
|
||||
if (irc_server_send (server, buffer, strlen (buffer)) <= 0)
|
||||
rc = 0;
|
||||
else
|
||||
@ -1057,8 +1074,8 @@ irc_server_send_one_msg (struct t_irc_server *server, char *message)
|
||||
first_message = 0;
|
||||
}
|
||||
}
|
||||
//else
|
||||
// gui_chat_printf_raw_data (server, 1, 1, _("(message dropped)"));
|
||||
else
|
||||
irc_debug_printf (server, 1, 1, _("(message dropped)"));
|
||||
if (new_msg)
|
||||
free (new_msg);
|
||||
|
||||
@ -1347,26 +1364,13 @@ irc_server_msgq_flush ()
|
||||
{
|
||||
if (irc_recv_msgq->data)
|
||||
{
|
||||
if (irc_debug)
|
||||
{
|
||||
weechat_printf (irc_recv_msgq->server->buffer,
|
||||
"[DEBUG] %s",
|
||||
irc_recv_msgq->data);
|
||||
}
|
||||
ptr_data = irc_recv_msgq->data;
|
||||
while (ptr_data[0] == ' ')
|
||||
ptr_data++;
|
||||
|
||||
if (ptr_data[0])
|
||||
{
|
||||
//gui_chat_printf_raw_data (irc_recv_msgq->server, 0, 0,
|
||||
// ptr_data);
|
||||
if (irc_debug)
|
||||
{
|
||||
weechat_printf (irc_recv_msgq->server->buffer,
|
||||
"[DEBUG] data received from server: %s",
|
||||
ptr_data);
|
||||
}
|
||||
irc_debug_printf (irc_recv_msgq->server, 0, 0, ptr_data);
|
||||
/*new_msg = plugin_modifier_exec (PLUGIN_MODIFIER_IRC_IN,
|
||||
irc_recv_msgq->server->name,
|
||||
ptr_data);*/
|
||||
@ -1391,9 +1395,9 @@ irc_server_msgq_flush ()
|
||||
if (pos)
|
||||
pos[0] = '\0';
|
||||
|
||||
//if (new_msg)
|
||||
// gui_chat_printf_raw_data (irc_recv_msgq->server,
|
||||
// 0, 1, ptr_msg);
|
||||
if (new_msg)
|
||||
irc_debug_printf (irc_recv_msgq->server, 0, 1,
|
||||
ptr_msg);
|
||||
|
||||
irc_server_parse_message (ptr_msg, &nick, &host,
|
||||
&command, &channel,
|
||||
@ -1474,9 +1478,9 @@ irc_server_msgq_flush ()
|
||||
ptr_msg = NULL;
|
||||
}
|
||||
}
|
||||
//else
|
||||
// gui_chat_printf_raw_data (irc_recv_msgq->server, 0, 1,
|
||||
// _("(message dropped)"));
|
||||
else
|
||||
irc_debug_printf (irc_recv_msgq->server, 0, 1,
|
||||
_("(message dropped)"));
|
||||
if (new_msg)
|
||||
free (new_msg);
|
||||
}
|
||||
@ -1724,7 +1728,8 @@ irc_server_login (struct t_irc_server *server)
|
||||
irc_server_sendf (server, "PASS %s", server->password);
|
||||
|
||||
if (!server->nick)
|
||||
server->nick = strdup (server->nicks_array[0]);
|
||||
irc_server_set_nick (server, server->nicks_array[0]);
|
||||
|
||||
irc_server_sendf (server,
|
||||
"NICK %s\n"
|
||||
"USER %s %s %s :%s",
|
||||
@ -2678,12 +2683,7 @@ irc_server_disconnect (struct t_irc_server *server, int reconnect)
|
||||
|
||||
/* discard current nick if no reconnection asked */
|
||||
if (!reconnect && server->nick)
|
||||
{
|
||||
free (server->nick);
|
||||
server->nick = NULL;
|
||||
}
|
||||
|
||||
//gui_window_redraw_buffer (weechat_current_buffer);
|
||||
irc_server_set_nick (server, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -139,6 +139,7 @@ extern struct t_irc_message *irc_recv_msgq, *irc_msgq_last_msg;
|
||||
|
||||
extern void irc_server_init (struct t_irc_server *server);
|
||||
extern int irc_server_init_with_url (struct t_irc_server *server, char *irc_url);
|
||||
extern void irc_server_set_nick (struct t_irc_server *server, char *nick);
|
||||
extern void irc_server_init_with_config_options (struct t_irc_server *server,
|
||||
struct t_config_section *section,
|
||||
int config_reload);
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
#include "irc-command.h"
|
||||
#include "irc-completion.h"
|
||||
#include "irc-config.h"
|
||||
#include "irc-debug.h"
|
||||
#include "irc-server.h"
|
||||
#include "irc-channel.h"
|
||||
#include "irc-nick.h"
|
||||
@ -52,68 +53,11 @@ struct t_weechat_plugin *weechat_irc_plugin = NULL;
|
||||
struct t_hook *irc_hook_timer = NULL;
|
||||
struct t_hook *irc_hook_timer_check_away = NULL;
|
||||
|
||||
int irc_debug = 0;
|
||||
|
||||
#ifdef HAVE_GNUTLS
|
||||
gnutls_certificate_credentials gnutls_xcred; /* gnutls client credentials */
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* irc_signal_debug_cb: callback for "debug" signal
|
||||
*/
|
||||
|
||||
int
|
||||
irc_signal_debug_cb (void *data, char *signal, char *type_data,
|
||||
void *signal_data)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
(void) signal;
|
||||
|
||||
if (strcmp (type_data, WEECHAT_HOOK_SIGNAL_STRING) == 0)
|
||||
{
|
||||
if (weechat_strcasecmp ((char *)signal_data, "irc") == 0)
|
||||
irc_debug ^= 1;
|
||||
}
|
||||
|
||||
if (irc_debug)
|
||||
weechat_printf (NULL, _("%s: debug enabled"), "irc");
|
||||
else
|
||||
weechat_printf (NULL, _("%s: debug disabled"), "irc");
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_signal_debug_dump_cb: dump IRC data in WeeChat log file
|
||||
*/
|
||||
|
||||
int
|
||||
irc_signal_debug_dump_cb (void *data, char *signal, char *type_data,
|
||||
void *signal_data)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) data;
|
||||
(void) signal;
|
||||
(void) type_data;
|
||||
(void) signal_data;
|
||||
|
||||
weechat_log_printf ("");
|
||||
weechat_log_printf ("***** \"%s\" plugin dump *****",
|
||||
weechat_plugin->name);
|
||||
|
||||
irc_server_print_log ();
|
||||
|
||||
//irc_dcc_print_log ();
|
||||
|
||||
weechat_log_printf ("");
|
||||
weechat_log_printf ("***** End of \"%s\" plugin dump *****",
|
||||
weechat_plugin->name);
|
||||
|
||||
return WEECHAT_RC_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_create_directories: create directories for IRC plugin
|
||||
*/
|
||||
@ -140,7 +84,7 @@ irc_create_directories ()
|
||||
}
|
||||
|
||||
/*
|
||||
* irc_siangl_quit_cb: callback for "quit" signal
|
||||
* irc_signal_quit_cb: callback for "quit" signal
|
||||
*/
|
||||
|
||||
int
|
||||
@ -192,8 +136,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin)
|
||||
irc_command_init ();
|
||||
|
||||
/* hook some signals */
|
||||
weechat_hook_signal ("debug", &irc_signal_debug_cb, NULL);
|
||||
weechat_hook_signal ("debug_dump", &irc_signal_debug_dump_cb, NULL);
|
||||
irc_debug_init ();
|
||||
weechat_hook_signal ("quit", &irc_signal_quit_cb, NULL);
|
||||
|
||||
/* hook completions */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user