Rename options "irc.look.open_{channel|pv}_near_server" to "irc.look.new_{channel|pv}_position" with new values (none, next or near_server)

v2.8-utf8proc
Sebastien Helleu 2010-10-07 14:48:45 +02:00
parent 36736564ab
commit 97a8a30a3d
17 changed files with 246 additions and 107 deletions

View File

@ -19,6 +19,8 @@ Version 0.3.4 (under dev!)
* api: add priority for hooks (task #10550)
* api: add new functions: hashtable_get_string, hook_info_hashtable,
info_get_hashtable
* irc: rename options "irc.look.open_{channel|pv}_near_server" to
"irc.look.new_{channel|pv}_position" with new values (none, next or near_server)
* irc: display old channel topic when topic is unset (task #9780)
* irc: add new info_hashtable "irc_parse_message"
* irc: fix crash/bug when option "addresses" for a server is unset or changed

View File

@ -163,6 +163,16 @@
** Typ: integer
** Werte: current, server (Standardwert: `current`)
* *irc.look.new_channel_position*
** Beschreibung: `force position of new channel in list of buffers (none = default position (should be last buffer)r, next = current buffer + 1, near_server = after last channel/pv of server)`
** Typ: integer
** Werte: none, next, near_server (Standardwert: `none`)
* *irc.look.new_pv_position*
** Beschreibung: `force position of new private in list of buffers (none = default position (should be last buffer)r, next = current buffer + 1, near_server = after last channel/pv of server)`
** Typ: integer
** Werte: none, next, near_server (Standardwert: `none`)
* *irc.look.nick_color_stop_chars*
** Beschreibung: `Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname lautet "|nick|abwesend" wobei das Zeichen "|" ignoriert werden soll. Die Farbe für den Nicknamen wird nun für "|nick" anstelle von "|nick|abwesend" erstellt).`
** Typ: Zeichenkette
@ -188,16 +198,6 @@
** Typ: integer
** Werte: auto, never, always (Standardwert: `auto`)
* *irc.look.open_channel_near_server*
** Beschreibung: `Öffne neue Channels neben dem Server-Buffer`
** Typ: boolesch
** Werte: on, off (Standardwert: `off`)
* *irc.look.open_pv_near_server*
** Beschreibung: `Öffne neue private Channels neben dem Server-Buffer`
** Typ: boolesch
** Werte: on, off (Standardwert: `off`)
* *irc.look.part_closes_buffer*
** Beschreibung: `Schließt den Buffer wenn "/part" im Channel ausgeführt wird`
** Typ: boolesch

View File

@ -163,6 +163,16 @@
** type: integer
** values: current, server (default value: `current`)
* *irc.look.new_channel_position*
** description: `force position of new channel in list of buffers (none = default position (should be last buffer)r, next = current buffer + 1, near_server = after last channel/pv of server)`
** type: integer
** values: none, next, near_server (default value: `none`)
* *irc.look.new_pv_position*
** description: `force position of new private in list of buffers (none = default position (should be last buffer)r, next = current buffer + 1, near_server = after last channel/pv of server)`
** type: integer
** values: none, next, near_server (default value: `none`)
* *irc.look.nick_color_stop_chars*
** description: `chars used to stop in nick when computing color with letters of nick (at least one char outside this list must be in string before stopping) (example: nick "|nick|away" with "|" in chars will return color of nick "|nick")`
** type: string
@ -188,16 +198,6 @@
** type: integer
** values: auto, never, always (default value: `auto`)
* *irc.look.open_channel_near_server*
** description: `open new channels near server`
** type: boolean
** values: on, off (default value: `off`)
* *irc.look.open_pv_near_server*
** description: `open new privates near server`
** type: boolean
** values: on, off (default value: `off`)
* *irc.look.part_closes_buffer*
** description: `close buffer when /part is issued on a channel`
** type: boolean

View File

@ -163,6 +163,16 @@
** type: entier
** valeurs: current, server (valeur par défaut: `current`)
* *irc.look.new_channel_position*
** description: `force la position du nouveau canal dans la liste des tampons (none = position par défaut (devrait être le dernier tampon), next = tampon courant + 1, near_server = après le dernier canal/privé du serveur)`
** type: entier
** valeurs: none, next, near_server (valeur par défaut: `none`)
* *irc.look.new_pv_position*
** description: `force la position du nouveau privé dans la liste des tampons (none = position par défaut (devrait être le dernier tampon), next = tampon courant + 1, near_server = après le dernier canal/privé du serveur)`
** type: entier
** valeurs: none, next, near_server (valeur par défaut: `none`)
* *irc.look.nick_color_stop_chars*
** description: `caractères utilisés pour l'arrêt dans le pseudo lors du calcul de la couleur avec les lettres du pseudo (au moins un caractère en dehors de cette liste doit être dans la chaîne avant de s'arrêter) (exemple: le pseudo "|nick|away" avec "|" dans les caractères retournera la couleur du pseudo "|nick")`
** type: chaîne
@ -188,16 +198,6 @@
** type: entier
** valeurs: auto, never, always (valeur par défaut: `auto`)
* *irc.look.open_channel_near_server*
** description: `ouvrir les nouveaux canaux près du serveur`
** type: booléen
** valeurs: on, off (valeur par défaut: `off`)
* *irc.look.open_pv_near_server*
** description: `ouvrir les nouveaux privés près du serveur`
** type: booléen
** valeurs: on, off (valeur par défaut: `off`)
* *irc.look.part_closes_buffer*
** description: `fermer le tampon lorsque /part est exécuté sur un canal`
** type: booléen

View File

@ -163,6 +163,16 @@
** tipo: intero
** valori: current, server (valore predefinito: `current`)
* *irc.look.new_channel_position*
** descrizione: `force position of new channel in list of buffers (none = default position (should be last buffer)r, next = current buffer + 1, near_server = after last channel/pv of server)`
** tipo: intero
** valori: none, next, near_server (valore predefinito: `none`)
* *irc.look.new_pv_position*
** descrizione: `force position of new private in list of buffers (none = default position (should be last buffer)r, next = current buffer + 1, near_server = after last channel/pv of server)`
** tipo: intero
** valori: none, next, near_server (valore predefinito: `none`)
* *irc.look.nick_color_stop_chars*
** descrizione: `caratteri usati per fermare il calcolo del colore con le lettere del nick (almeno un carattere al di fuori di questa lista deve essere nella lista prima di fermarlo) (esempio: nick "|nick|away" con "|" nei caratteri restituisce il colore del nick "|nick")`
** tipo: stringa
@ -188,16 +198,6 @@
** tipo: intero
** valori: auto, never, always (valore predefinito: `auto`)
* *irc.look.open_channel_near_server*
** descrizione: `apri nuovi canali vicino al server`
** tipo: bool
** valori: on, off (valore predefinito: `off`)
* *irc.look.open_pv_near_server*
** descrizione: `apri nuovi privati vicino al server`
** tipo: bool
** valori: on, off (valore predefinito: `off`)
* *irc.look.part_closes_buffer*
** descrizione: `chiude buffer quando viene digitato /part nel canale`
** tipo: bool

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4480,11 +4480,17 @@ msgstr "použít stejnou barvu přezdívky pro kanál a soukromý rozhovor"
msgid "merge server buffers"
msgstr "spojit buffery serverů"
msgid "open new channels near server"
msgstr "otevřít nový kanál poblíž serveru"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "open new privates near server"
msgstr "otevřít nový soukromý rozhovor poblíž serveru"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "text pro zobrazení před přezdívkou v okně rozhovoru"
@ -6874,6 +6880,12 @@ msgstr ""
msgid "Pointer"
msgstr "Ukazatel"
#~ msgid "open new channels near server"
#~ msgstr "otevřít nový kanál poblíž serveru"
#~ msgid "open new privates near server"
#~ msgstr "otevřít nový soukromý rozhovor poblíž serveru"
#~ msgid "%s%s: addresses not defined for server \"%s\", cannot connect"
#~ msgstr "%s%s: adresa pro server \"%s\" není definována, nemohu se připojit"

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-09-28 09:34+0200\n"
"Last-Translator: Nils G.\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4659,11 +4659,17 @@ msgstr ""
msgid "merge server buffers"
msgstr "Server-Buffer zusammenlegen"
msgid "open new channels near server"
msgstr "Öffne neue Channels neben dem Server-Buffer"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "open new privates near server"
msgstr "Öffne neue private Channels neben dem Server-Buffer"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "Text, der im Chatfenster vor dem Nickname erscheinen soll"
@ -7142,6 +7148,12 @@ msgstr "Hashtable (Ausgabe)"
msgid "Pointer"
msgstr "Pointer"
#~ msgid "open new channels near server"
#~ msgstr "Öffne neue Channels neben dem Server-Buffer"
#~ msgid "open new privates near server"
#~ msgstr "Öffne neue private Channels neben dem Server-Buffer"
#~ msgid "%s%s: addresses not defined for server \"%s\", cannot connect"
#~ msgstr ""
#~ "%s%s: Adresse für den Server \"%s\" nicht definiert, Verbindung wird "

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4535,11 +4535,17 @@ msgstr "usar el mismo color de apodo en el canal y conversaciones privadas"
msgid "merge server buffers"
msgstr "unir buffers de los servidores"
msgid "open new channels near server"
msgstr "abrir nuevos canales cerca del servidor"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "open new privates near server"
msgstr "abrir nuevas conversaciones privadas cerca del servidor"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "texto a mostrar antes del apodo en la ventana de charla"
@ -6964,6 +6970,12 @@ msgstr ""
msgid "Pointer"
msgstr "Puntero"
#~ msgid "open new channels near server"
#~ msgstr "abrir nuevos canales cerca del servidor"
#~ msgid "open new privates near server"
#~ msgstr "abrir nuevas conversaciones privadas cerca del servidor"
#~ msgid "%s%s: addresses not defined for server \"%s\", cannot connect"
#~ msgstr ""
#~ "%s%s: dirección sin definir para el servidor \"%s\", no es posible "

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"PO-Revision-Date: 2010-10-07 12:46+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-10-07 14:46+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@ -4584,11 +4584,23 @@ msgstr "utiliser la même couleur de pseudo pour le canal et le privé"
msgid "merge server buffers"
msgstr "mélange des tampons de serveur"
msgid "open new channels near server"
msgstr "ouvrir les nouveaux canaux près du serveur"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
"force la position du nouveau canal dans la liste des tampons (none = "
"position par défaut (devrait être le dernier tampon), next = tampon courant "
"+ 1, near_server = après le dernier canal/privé du serveur)"
msgid "open new privates near server"
msgstr "ouvrir les nouveaux privés près du serveur"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
"force la position du nouveau privé dans la liste des tampons (none = "
"position par défaut (devrait être le dernier tampon), next = tampon courant "
"+ 1, near_server = après le dernier canal/privé du serveur)"
msgid "text to display before nick in chat window"
msgstr "texte à afficher avant le pseudo dans la fenêtre de discussion"
@ -7025,6 +7037,12 @@ msgstr "Hashtable (sortie)"
msgid "Pointer"
msgstr "Pointeur"
#~ msgid "open new channels near server"
#~ msgstr "ouvrir les nouveaux canaux près du serveur"
#~ msgid "open new privates near server"
#~ msgstr "ouvrir les nouveaux privés près du serveur"
#~ msgid "%s%s: addresses not defined for server \"%s\", cannot connect"
#~ msgstr ""
#~ "%s%s: adresses non définies pour le serveur \"%s\", connexion impossible"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4271,13 +4271,17 @@ msgstr "másik fél nevének színe privát beszélgetésben"
msgid "merge server buffers"
msgstr "pufferek kezelése"
#, fuzzy
msgid "open new channels near server"
msgstr "az új szobák/privát beszélgetések a szerverhez közel nyíljanak"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
#, fuzzy
msgid "open new privates near server"
msgstr "az új szobák/privát beszélgetések a szerverhez közel nyíljanak"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
@ -6622,6 +6626,14 @@ msgstr ""
msgid "Pointer"
msgstr "perc"
#, fuzzy
#~ msgid "open new channels near server"
#~ msgstr "az új szobák/privát beszélgetések a szerverhez közel nyíljanak"
#, fuzzy
#~ msgid "open new privates near server"
#~ msgstr "az új szobák/privát beszélgetések a szerverhez közel nyíljanak"
#, fuzzy
#~ msgid "%s%s: buffer not found for IRC server \"%s\", channel \"%s\""
#~ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-09-22 15:27+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4547,11 +4547,17 @@ msgstr "usa lo stesso colore del nick per canale e privato"
msgid "merge server buffers"
msgstr "unisci i buffer dei server"
msgid "open new channels near server"
msgstr "apri nuovi canali vicino al server"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "open new privates near server"
msgstr "apri nuovi privati vicino al server"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "testo da visualizzare prima del nick nella finestra di chat"
@ -6974,6 +6980,12 @@ msgstr "Tabella hash (output)"
msgid "Pointer"
msgstr "Puntatore"
#~ msgid "open new channels near server"
#~ msgstr "apri nuovi canali vicino al server"
#~ msgid "open new privates near server"
#~ msgstr "apri nuovi privati vicino al server"
#~ msgid "%s%s: addresses not defined for server \"%s\", cannot connect"
#~ msgstr ""
#~ "%s%s: indirizzo non definito per il server \"%s\", impossibile connettersi"

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4516,11 +4516,17 @@ msgstr "użyj takiego samego koloru nicka na kanałach i privach"
msgid "merge server buffers"
msgstr "połącz bufory serwerów"
msgid "open new channels near server"
msgstr "otwórz nowy kanał blisko serwera"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "open new privates near server"
msgstr "otwórz prywatne konwersacje blisko serwera"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "teks wyświetlany przed nickiem w oknie rozmowy"
@ -6891,6 +6897,12 @@ msgstr ""
msgid "Pointer"
msgstr "Wskaźnik"
#~ msgid "open new channels near server"
#~ msgstr "otwórz nowy kanał blisko serwera"
#~ msgid "open new privates near server"
#~ msgstr "otwórz prywatne konwersacje blisko serwera"
#~ msgid "%s%s: addresses not defined for server \"%s\", cannot connect"
#~ msgstr ""
#~ "%s%s: adres nie zdefiniowany dla serwera \"%s\", nie można się połączyć"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2010-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -4277,13 +4277,17 @@ msgstr "цвет ника собеседника в окне привата"
msgid "merge server buffers"
msgstr "управление буферами"
#, fuzzy
msgid "open new channels near server"
msgstr "открывать новые каналы/приваты рядом с сервером"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
#, fuzzy
msgid "open new privates near server"
msgstr "открывать новые каналы/приваты рядом с сервером"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"
msgstr "текст, который отображать до ника в окне чата"
@ -6625,6 +6629,14 @@ msgstr ""
msgid "Pointer"
msgstr "минута"
#, fuzzy
#~ msgid "open new channels near server"
#~ msgstr "открывать новые каналы/приваты рядом с сервером"
#, fuzzy
#~ msgid "open new privates near server"
#~ msgstr "открывать новые каналы/приваты рядом с сервером"
#, fuzzy
#~ msgid "%s%s: buffer not found for IRC server \"%s\", channel \"%s\""
#~ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n"

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-10-07 12:45+0200\n"
"POT-Creation-Date: 2010-10-07 14:45+0200\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"
@ -3646,10 +3646,16 @@ msgstr ""
msgid "merge server buffers"
msgstr ""
msgid "open new channels near server"
msgid ""
"force position of new channel in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "open new privates near server"
msgid ""
"force position of new private in list of buffers (none = default position "
"(should be last buffer)r, next = current buffer + 1, near_server = after "
"last channel/pv of server)"
msgstr ""
msgid "text to display before nick in chat window"

View File

@ -150,8 +150,8 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
{
struct t_irc_channel *new_channel;
struct t_gui_buffer *new_buffer;
int buffer_created;
char *buffer_name;
int buffer_created, current_buffer_number, buffer_position;
char *buffer_name, str_number[32];;
/* alloc memory for new channel */
if ((new_channel = malloc (sizeof (*new_channel))) == NULL)
@ -170,6 +170,8 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
weechat_nicklist_remove_all (new_buffer);
else
{
current_buffer_number = weechat_buffer_get_integer (weechat_current_buffer (),
"number");
new_buffer = weechat_buffer_new (buffer_name,
&irc_input_data_cb, NULL,
&irc_buffer_close_cb, NULL);
@ -178,12 +180,24 @@ irc_channel_new (struct t_irc_server *server, int channel_type,
free (new_channel);
return NULL;
}
if (((channel_type == IRC_CHANNEL_TYPE_CHANNEL)
&& weechat_config_boolean (irc_config_look_open_channel_near_server))
|| ((channel_type == IRC_CHANNEL_TYPE_PRIVATE)
&& weechat_config_boolean (irc_config_look_open_pv_near_server)))
buffer_position = (channel_type == IRC_CHANNEL_TYPE_CHANNEL) ?
weechat_config_integer (irc_config_look_new_channel_position) :
weechat_config_integer (irc_config_look_new_pv_position);
switch (buffer_position)
{
irc_channel_move_near_server (server, channel_type, new_buffer);
case IRC_CONFIG_LOOK_BUFFER_POSITION_NONE:
/* do nothing */
break;
case IRC_CONFIG_LOOK_BUFFER_POSITION_NEXT:
/* move buffer to current number + 1 */
snprintf (str_number, sizeof (str_number),
"%d", current_buffer_number + 1);
weechat_buffer_set (new_buffer, "number", str_number);
break;
case IRC_CONFIG_LOOK_BUFFER_POSITION_NEAR_SERVER:
/* move buffer after last channel/pv of server */
irc_channel_move_near_server (server, channel_type, new_buffer);
break;
}
buffer_created = 1;
}

View File

@ -52,8 +52,8 @@ struct t_config_section *irc_config_section_server = NULL;
struct t_config_option *irc_config_look_color_nicks_in_server_messages;
struct t_config_option *irc_config_look_color_pv_nick_like_channel;
struct t_config_option *irc_config_look_server_buffer;
struct t_config_option *irc_config_look_open_channel_near_server;
struct t_config_option *irc_config_look_open_pv_near_server;
struct t_config_option *irc_config_look_new_channel_position;
struct t_config_option *irc_config_look_new_pv_position;
struct t_config_option *irc_config_look_nick_prefix;
struct t_config_option *irc_config_look_nick_suffix;
struct t_config_option *irc_config_look_nick_completion_smart;
@ -1545,16 +1545,24 @@ irc_config_init ()
"merge_with_core|merge_without_core|independent", 0, 0, "merge_with_core",
NULL, 0, NULL, NULL,
&irc_config_change_look_server_buffer, NULL, NULL, NULL);
irc_config_look_open_channel_near_server = weechat_config_new_option (
irc_config_look_new_channel_position = weechat_config_new_option (
irc_config_file, ptr_section,
"open_channel_near_server", "boolean",
N_("open new channels near server"),
NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_open_pv_near_server = weechat_config_new_option (
"new_channel_position", "integer",
N_("force position of new channel in list of buffers "
"(none = default position (should be last buffer)r, "
"next = current buffer + 1, near_server = after last channel/pv "
"of server)"),
"none|next|near_server", 0, 0, "none",
NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_new_pv_position = weechat_config_new_option (
irc_config_file, ptr_section,
"open_pv_near_server", "boolean",
N_("open new privates near server"),
NULL, 0, 0, "off", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
"new_pv_position", "integer",
N_("force position of new private in list of buffers "
"(none = default position (should be last buffer)r, "
"next = current buffer + 1, near_server = after last channel/pv "
"of server)"),
"none|next|near_server", 0, 0, "none",
NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_nick_prefix = weechat_config_new_option (
irc_config_file, ptr_section,
"nick_prefix", "string",

View File

@ -29,6 +29,13 @@ enum t_irc_config_look_server_buffer
IRC_CONFIG_LOOK_SERVER_BUFFER_INDEPENDENT,
};
enum t_irc_config_look_buffer_position
{
IRC_CONFIG_LOOK_BUFFER_POSITION_NONE = 0,
IRC_CONFIG_LOOK_BUFFER_POSITION_NEXT,
IRC_CONFIG_LOOK_BUFFER_POSITION_NEAR_SERVER,
};
enum t_irc_config_look_item_display_server
{
IRC_CONFIG_LOOK_ITEM_DISPLAY_SERVER_PLUGIN = 0,
@ -71,8 +78,8 @@ extern struct t_config_section *irc_config_section_server;
extern struct t_config_option *irc_config_look_color_nicks_in_server_messages;
extern struct t_config_option *irc_config_look_color_pv_nick_like_channel;
extern struct t_config_option *irc_config_look_server_buffer;
extern struct t_config_option *irc_config_look_open_channel_near_server;
extern struct t_config_option *irc_config_look_open_pv_near_server;
extern struct t_config_option *irc_config_look_new_channel_position;
extern struct t_config_option *irc_config_look_new_pv_position;
extern struct t_config_option *irc_config_look_nick_prefix;
extern struct t_config_option *irc_config_look_nick_suffix;
extern struct t_config_option *irc_config_look_nick_completion_smart;