Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix faulty theme building #17

Merged
merged 3 commits into from

2 participants

@przemoc

W sumie 3 patche:

  • naprawienie skopanego vim-owego modeline (wyszło przy okazji),
  • lepszy i poprawniejszy oneliner do generowania theme'a ze źródeł,
  • scalenie rozbitych format_add() (żeby już nie było żadnych problemów z generowaniem tego theme).
przemoc added some commits
@przemoc przemoc Fix broken vim modeline in xml files.
* docs/ekg2book-en/develbook.xml: vim: Use fenc instead of enc.
* docs/ekg2book-en/faq.xml: Ditto.
* docs/ekg2book-en/userbook.xml: Ditto.
* docs/ekg2book/develbook.xml: Ditto.
* docs/ekg2book/faq.xml: Ditto.
* docs/ekg2book/userbook.xml: Ditto.
* plugins/logsqlite/doc.xml: Ditto.
* plugins/python/doc.xml: Ditto.
d3d114a
@przemoc przemoc Fix faulty default theme generating oneliner.
grep | cut | perl was rather insane way of doing simple task and RE used
in perl was faulty (greedy any char separator between quotation marks).
Replace it with sed fed up via find+xargs (no -print0 for better
portability).

    find . -name '*.c' -type f | xargs sed \
        '/^[ \t]*format_add("/!d;s///;s/"[^"]*"\(.*\)".*/ \1/'

Comparison of sorted results (diff -u old new | diffstat)
- master: 6 insertions(+), 1132 deletions(-)
- 0.3.1:  6 insertions(+), 20 deletions(-)

Notable changes:

-icq_auth_subscribe  to refuse. Reason: %T%3%n
+icq_auth_subscribe %> (%1) %T%2%n asks for authorisation. Use \"/auth -a %2\" to accept, \"/auth -d %2 [reason]\" to refuse. Reason: %T%3%n

-inet_addr_failed .%n\n
+inet_addr_failed %! (%1) Invalid \"server\".%n\n

-jabber_auth_rejectnoreq  to force unauth.\n
+jabber_auth_rejectnoreq %! (%2) No pending authorization request from %T%1%n. Use \"/auth -d %1\" to force unauth.\n

-jabber_auth_subscribe  to refuse.%n\n
+jabber_auth_subscribe %> (%2) %T%1%n asks for authorisation. Use \"/auth -a %1\" to accept, \"/auth -d %1\" to refuse.%n\n

+jabber_auth_unsubscribe %> (%2) %T%1%n asks for removal. Use \"/auth -d %1\" to delete.%n\n

But there is also screwed: jabber_muc_room_created.

* docs/ekg2book-en/develbook.xml: Improve theme oneliner.
* docs/ekg2book/develbook.xml: Ditto.
f146ad3
@przemoc przemoc Do not split format_add() calls across many lines.
Now, default theme generating oneliner should work flawlessly.

Fixed keys:
- gpg_key_set_newf
- gpg_key_set_new
- header
- jabber_gpg_fail
- jabber_muc_room_created
- passwd_possible_abuse
- remote_welcome
- RPL_WHOISUSER
- RPL_WHOWASUSER
- statusbar

* contrib/ekg_hash_benchmark.inc: Join splitted format_add() calls.
* ekg/themes.c: Ditto.
* plugins/gpg/gpg.c: Ditto.
* plugins/irc/irc.c: Ditto.
* plugins/jabber/jabber.c: Ditto.
* plugins/ncurses/main.c: Ditto.
* remote/themes.c: Ditto.
14ad30a
@mgorny mgorny merged commit 14ad30a into from
@mgorny
Collaborator

Ok, pierwszy i trzeci wrzuciłem, drugi do rozważenia jak w komentarzu. Swoją drogą, trzeba było zrobić rebase; gdyby trzeci był przed drugim, kod nie byłby ani przez chwilę zepsuty.

@przemoc

Hm... w repo widzę całość.

Uwaga chyba jednak niesłuszna, bo przecież kodu nikt tu nie zepsuł, a stary jednolinijkowiec grep+cut+perl tak samo sobie nie radził z wielolinijkowymi format_add(), a właściwie gorzej sobie radził w ogóle z powodu błędów w regexpie. Tak więc do drugiego commita włącznie zachowany został status quo "zepsucia" (które, podkreślam, było wcześniej) choć z istotnym usprawnieniem. Jedyne pogorszenie, jakiego można na tym etapie się doszukać, to linijka jabber_muc_room_created", na wyjściu z nowego jednolinijkowca, ale to jest zwyczajne szukanie dziury w całym.

@mgorny
Collaborator

Atfu, fakt, merge wziąłem zamiast cherry-pick ;f.

@przemoc

Jednolinijkowiec został zdexargsowany. 5666c8092e174b697b91 leży na końcu mego brancha.

Wszystkie commity (poza ostatnim ww.) powstały w zasadzie tylko dlatego, że chciałem sobie zegarek należycie usunąć... :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 29, 2011
  1. @przemoc

    Fix broken vim modeline in xml files.

    przemoc authored
    * docs/ekg2book-en/develbook.xml: vim: Use fenc instead of enc.
    * docs/ekg2book-en/faq.xml: Ditto.
    * docs/ekg2book-en/userbook.xml: Ditto.
    * docs/ekg2book/develbook.xml: Ditto.
    * docs/ekg2book/faq.xml: Ditto.
    * docs/ekg2book/userbook.xml: Ditto.
    * plugins/logsqlite/doc.xml: Ditto.
    * plugins/python/doc.xml: Ditto.
  2. @przemoc

    Fix faulty default theme generating oneliner.

    przemoc authored
    grep | cut | perl was rather insane way of doing simple task and RE used
    in perl was faulty (greedy any char separator between quotation marks).
    Replace it with sed fed up via find+xargs (no -print0 for better
    portability).
    
        find . -name '*.c' -type f | xargs sed \
            '/^[ \t]*format_add("/!d;s///;s/"[^"]*"\(.*\)".*/ \1/'
    
    Comparison of sorted results (diff -u old new | diffstat)
    - master: 6 insertions(+), 1132 deletions(-)
    - 0.3.1:  6 insertions(+), 20 deletions(-)
    
    Notable changes:
    
    -icq_auth_subscribe  to refuse. Reason: %T%3%n
    +icq_auth_subscribe %> (%1) %T%2%n asks for authorisation. Use \"/auth -a %2\" to accept, \"/auth -d %2 [reason]\" to refuse. Reason: %T%3%n
    
    -inet_addr_failed .%n\n
    +inet_addr_failed %! (%1) Invalid \"server\".%n\n
    
    -jabber_auth_rejectnoreq  to force unauth.\n
    +jabber_auth_rejectnoreq %! (%2) No pending authorization request from %T%1%n. Use \"/auth -d %1\" to force unauth.\n
    
    -jabber_auth_subscribe  to refuse.%n\n
    +jabber_auth_subscribe %> (%2) %T%1%n asks for authorisation. Use \"/auth -a %1\" to accept, \"/auth -d %1\" to refuse.%n\n
    
    +jabber_auth_unsubscribe %> (%2) %T%1%n asks for removal. Use \"/auth -d %1\" to delete.%n\n
    
    But there is also screwed: jabber_muc_room_created.
    
    * docs/ekg2book-en/develbook.xml: Improve theme oneliner.
    * docs/ekg2book/develbook.xml: Ditto.
  3. @przemoc

    Do not split format_add() calls across many lines.

    przemoc authored
    Now, default theme generating oneliner should work flawlessly.
    
    Fixed keys:
    - gpg_key_set_newf
    - gpg_key_set_new
    - header
    - jabber_gpg_fail
    - jabber_muc_room_created
    - passwd_possible_abuse
    - remote_welcome
    - RPL_WHOISUSER
    - RPL_WHOWASUSER
    - statusbar
    
    * contrib/ekg_hash_benchmark.inc: Join splitted format_add() calls.
    * ekg/themes.c: Ditto.
    * plugins/gpg/gpg.c: Ditto.
    * plugins/irc/irc.c: Ditto.
    * plugins/jabber/jabber.c: Ditto.
    * plugins/ncurses/main.c: Ditto.
    * remote/themes.c: Ditto.
This page is out of date. Refresh to see the latest.
View
21 contrib/ekg_hash_benchmark.inc
@@ -378,8 +378,7 @@
format_add("passwd", _("%> Password changed\n"), 1);
format_add("passwd_failed", _("%! Error while changing password: %1\n"), 1);
format_add("passwd_timeout", _("%! Password changing timed out\n"), 1);
- format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually "
- "change your session password using /session password", 1);
+ format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually change your session password using /session password", 1);
format_add("passwd_abuse", "%! (%1) Somebody want to clear our password (%2)", 1);
format_add("change", _("%> Informations in public directory chenged\n"), 1);
format_add("change_failed", _("%! Error while changing information in public directory\n"), 1);
@@ -765,10 +764,8 @@
format_add("gg_version", _("%> %TGadu-Gadu%n: libgadu %g%1%n (headers %c%2%n), protocol %g%3%n (%c0x%4%n)"), 1);
format_add("gpg_key_unset", _("%) GPGKEY for uid: %W%1%n UNSET!"), 1);
format_add("gpg_key_not_found", _("%> GPGKEY for uid: %W%1%n NOT FOUND!"), 1);
- format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n"
- "%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
- format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n"
- "%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
+ format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
+ format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
format_add("gpg_key_set_ok", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon"), 1);
format_add("gpg_key_set_okf", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon (Forcing key is not nessesary here!)"), 1);
format_add("gpg_key_set_okbutver", _("%! Keys matched, but lasttime we fail to verify key. Encryption won't work until forced."), 1);
@@ -849,10 +846,8 @@
// format_add("RPL_WHOREPLY", "%g|| %c%3 %W%7 %n%8 %6 %4@%5 %W%9\n", 1);
format_add("RPL_WHOREPLY", "%g|| %c%3 %W%7 %n%8 %6 %4@%5 %W%9\n", 1);
format_add("RPL_AWAY", _("%G||%n away : %2 - %3\n"), 1);
- format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
- format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
// format_add("IRC_WHOERROR", _("%G.+===%g-----\n%G||%n %3 (%2)\n"), 1);
// format_add("IRC_ERR_NOSUCHNICK", _("%n %3 (%2)\n"), 1);
format_add("RPL_WHOISCHANNELS", _("%G||%n %|channels : %3\n"), 1);
@@ -965,8 +960,7 @@
format_add("jabber_vacation", _("%> You'd set up your vacation status: %g%2%n (since: %3 expires@%4)"), 1);
format_add("jabber_muc_recv", "%B<%w%X%5%3%B>%n %4", 1);
format_add("jabber_muc_send", "%B<%n%X%5%W%3%B>%n %4", 1);
- format_add("jabber_muc_room_created",
- _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
+ format_add("jabber_muc_room_created", _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
format_add("jabber_muc_banlist", _("%g|| %n %5 - %W%2%n: ban %c%3%n [%4]"), 1); /* %1 sesja %2 kanal %3 kto %4 reason %5 numerek */
// format_add("jabber_send_chan", _("%B<%W%2%B>%n %5"), 1);
// format_add("jabber_send_chan_n", _("%B<%W%2%B>%n %5"), 1);
@@ -991,8 +985,7 @@
format_add("jabber_gpg_config", _("%> (%1) First set gpg_key and gpg_password before turning on gpg_active!"), 1); /* sesja */
format_add("jabber_gpg_ok", _("%) (%1) GPG support: %gENABLED%n using key: %W%2%n"), 1); /* sesja, klucz */
format_add("jabber_gpg_sok", _("%) GPG key: %W%2%n"), 1); /* sesja, klucz for /status */
- format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\n" /* sesja, klucz, error */
- "OpenGPG support for this session disabled."), 1);
+ format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\nOpenGPG support for this session disabled."), 1); /* sesja, klucz, error */
format_add("jabber_msg_xmlsyntaxerr", _("%! Expat syntax-checking failed on your message: %T%1%n. Please correct your code or use double ^R to disable syntax-checking."), 1);
format_add("jabber_conversations_begin", _("%g,+=%G--%n (%1) %GAvailable Reply-IDs:%n"), 1);
format_add("jabber_conversations_item", _("%g|| %n %1 - %W%2%n (%g%3%n [%c%4%n])"), 1); /* %1 - n, %2 - user, %3 - subject, %4 - thread */
View
8 docs/ekg2book-en/develbook.xml
@@ -365,9 +365,9 @@ Copyright 2000 Free Software Foundation, Inc.
</para>
<programlisting role="shell">
<![CDATA[
-grep -R -I 'format_add("' * | cut -d: -f2- | \
- perl -ne '/format_add\("(.*?)".+"(.*)".*/; print $1." ".$2."\n"' \
- > my.theme
+find . -name '*.c' -type f | xargs sed \
+ '/^[ \t]*format_add("/!d;s///;s/"[^"]*"\(.*\)".*/ \1/' \
+ > my.theme
]]>
</programlisting>
<para>
@@ -795,5 +795,5 @@ tekst tekst2
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
2  docs/ekg2book-en/faq.xml
@@ -332,5 +332,5 @@ $ ./configure --with-libintl-prefix=/usr/local/include
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
2  docs/ekg2book-en/userbook.xml
@@ -38,5 +38,5 @@
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
8 docs/ekg2book/develbook.xml
@@ -363,9 +363,9 @@ Copyright 2000 Free Software Foundation, Inc.
</para>
<programlisting role="shell">
<![CDATA[
-grep -R -I 'format_add("' * | cut -d: -f2- | \
- perl -ne '/format_add\("(.*?)".+"(.*)".*/; print $1." ".$2."\n"' \
- > my.theme
+find . -name '*.c' -type f | xargs sed \
+ '/^[ \t]*format_add("/!d;s///;s/"[^"]*"\(.*\)".*/ \1/' \
+ > my.theme
]]>
</programlisting>
<para>
@@ -793,5 +793,5 @@ tekst tekst2
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
2  docs/ekg2book/faq.xml
@@ -384,5 +384,5 @@ $ ./configure --with-libintl-prefix=/usr/local/include
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
2  docs/ekg2book/userbook.xml
@@ -38,5 +38,5 @@
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
3  ekg/themes.c
@@ -1801,8 +1801,7 @@ void theme_init()
format_add("passwd", _("%> Password changed\n"), 1);
format_add("passwd_failed", _("%! Error while changing password: %1\n"), 1);
format_add("passwd_timeout", _("%! Password changing timed out\n"), 1);
- format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually "
- "change your session password using /session password", 1);
+ format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually change your session password using /session password", 1);
format_add("passwd_abuse", "%! (%1) Somebody want to clear our password (%2)", 1);
/* changing information in public catalog */
View
6 plugins/gpg/gpg.c
@@ -589,10 +589,8 @@ static int gpg_theme_init() {
format_add("gpg_key_unset", _("%) GPGKEY for uid: %W%1%n UNSET!"), 1);
format_add("gpg_key_not_found", _("%> GPGKEY for uid: %W%1%n NOT FOUND!"), 1);
- format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n"
- "%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
- format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n"
- "%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
+ format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
+ format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
format_add("gpg_key_set_ok", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon"), 1);
format_add("gpg_key_set_okf", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon (Forcing key is not nessesary here!)"), 1);
View
6 plugins/irc/irc.c
@@ -2238,11 +2238,9 @@ static int irc_theme_init()
format_add("RPL_AWAY", _("%G||%n away : %2 - %3\n"), 1);
/* in whois %2 is always nick */
- format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
- format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
/* %2 - nick %3 - there is/ was no such nickname / channel, and so on... */
/*
View
6 plugins/jabber/jabber.c
@@ -1199,8 +1199,7 @@ static int jabber_theme_init() {
/* %1 - sessionname, %2 - mucjid %3 - text */
format_add("jabber_muc_notice", "%n-%P%2%n- %3", 1);
- format_add("jabber_muc_room_created",
- _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
+ format_add("jabber_muc_room_created", _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
format_add("jabber_muc_banlist", _("%g|| %n %5 - %W%2%n: ban %c%3%n [%4]"), 1); /* %1 sesja %2 kanal %3 kto %4 reason %5 numerek */
#if 0
format_add("jabber_send_chan", _("%B<%W%2%B>%n %5"), 1);
@@ -1258,8 +1257,7 @@ static int jabber_theme_init() {
format_add("jabber_gpg_config", _("%> (%1) First set gpg_key and gpg_password before turning on gpg_active!"), 1); /* sesja */
format_add("jabber_gpg_ok", _("%) (%1) GPG support: %gENABLED%n using key: %W%2%n"), 1); /* sesja, klucz */
format_add("jabber_gpg_sok", _("%) GPG key: %W%2%n"), 1); /* sesja, klucz for /status */
- format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\n" /* sesja, klucz, error */
- "OpenGPG support for this session disabled."), 1);
+ format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\nOpenGPG support for this session disabled."), 1); /* sesja, klucz, error */
/* stream:features */
/* %1 - sesja, %2 - serwer, %3 - nazwa, %4 - XMLNS, %5 - z czym sie je */
View
2  plugins/logsqlite/doc.xml
@@ -107,5 +107,5 @@
</sect3>
</sect2>
<!--
-vim: ft=docbk encoding=iso-8859-2
+vim: ft=docbk fileencoding=iso-8859-2
-->
View
10 plugins/ncurses/main.c
@@ -593,14 +593,8 @@ static int ncurses_theme_init() {
/* prompty i statusy dla ui-ncurses */
format_add("ncurses_prompt_none", "", 1);
format_add("ncurses_prompt_query", "[%Y%1%n] ", 1);
- format_add("statusbar", " %c(%w%{time}%c)%w %c(%w%{?session %{?away %G}%{?avail %Y}%{?chat %W}%{?dnd %K}%{?xa %g}%{?gone %R}"
- "%{?invisible %C}%{?notavail %r}%{session}}%{?!session ---}%c) %{?window (%wwin%c/%w%{?typing %C}%{window}}"
- "%{?query %c:%W%{query}}%{?debug %c(%Cdebug}%c)%w%{?activity %c(%wact%c/%W}%{activity}%{?activity %c)%w}"
- "%{?mail %c(%wmail%c/%w}%{mail}%{?mail %c)}%{?more %c(%Gmore%c)}", 1);
- format_add("header", " %{?query %c(%{?query_away %w}%{?query_avail %W}%{?query_invisible %K}%{?query_notavail %k}"
- "%{?query_chat %W}%{?query_dnd %K}%{query_xa %g}%{?query_gone %R}%{?query_unknown %M}%{?query_error %m}%{?query_blocking %m}"
- "%{query}%{?query_descr %c/%w%{query_descr}}%c) %{?query_ip (%wip%c/%w%{query_ip}%c)} %{irctopic}}"
- "%{?!query %c(%wekg2%c/%w%{version}%c) (%w%{url}%c)}", 1);
+ format_add("statusbar", " %c(%w%{time}%c)%w %c(%w%{?session %{?away %G}%{?avail %Y}%{?chat %W}%{?dnd %K}%{?xa %g}%{?gone %R}%{?invisible %C}%{?notavail %r}%{session}}%{?!session ---}%c) %{?window (%wwin%c/%w%{?typing %C}%{window}}%{?query %c:%W%{query}}%{?debug %c(%Cdebug}%c)%w%{?activity %c(%wact%c/%W}%{activity}%{?activity %c)%w}%{?mail %c(%wmail%c/%w}%{mail}%{?mail %c)}%{?more %c(%Gmore%c)}", 1);
+ format_add("header", " %{?query %c(%{?query_away %w}%{?query_avail %W}%{?query_invisible %K}%{?query_notavail %k}%{?query_chat %W}%{?query_dnd %K}%{query_xa %g}%{?query_gone %R}%{?query_unknown %M}%{?query_error %m}%{?query_blocking %m}%{query}%{?query_descr %c/%w%{query_descr}}%c) %{?query_ip (%wip%c/%w%{query_ip}%c)} %{irctopic}}%{?!query %c(%wekg2%c/%w%{version}%c) (%w%{url}%c)}", 1);
format_add("statusbar_act_important", "%Y", 1);
format_add("statusbar_act_important2us", "%W", 1);
format_add("statusbar_act", "%K", 1);
View
2  plugins/python/doc.xml
@@ -921,5 +921,5 @@ ekg.variable_add('zmienna_testowa', 'warto
</programlisting>
</sect2>
<!--
-vim: ft=docbk encoding=iso-8859-2
+vim: ft=docbk fileencoding=iso-8859-2
-->
View
4 remote/themes.c
@@ -952,9 +952,7 @@ EXPORTNOT void theme_init() {
format_add("remote_warndebug", "ekg2-remote: %r%1\n", 1);
format_add("remote_okdebug", "ekg2-remote: %G%1\n", 1);
- format_add("remote_welcome", _("%> %|%Tekg2-remote-0.4%n (%ge%Gk%gg %Gr%ge%Gl%go%Ga%gd%Ge%gd%n)\n"
- "Connected to: %T%1%n\n%rNOTE: All commands except /quit will be executed remotely!\n"
- "If you want to shutdown remote ekg2 type %W/exit [reason]%n"), 1);
+ format_add("remote_welcome", _("%> %|%Tekg2-remote-0.4%n (%ge%Gk%gg %Gr%ge%Gl%go%Ga%gd%Ge%gd%n)\nConnected to: %T%1%n\n%rNOTE: All commands except /quit will be executed remotely!\nIf you want to shutdown remote ekg2 type %W/exit [reason]%n"), 1);
format_add("remote_console_charset_using", _("%) %Tekg2-remote%n detected that your console works under: %W%1%n Please verify and run ekg2-remote -c your-encoding if needed"), 1);
}
Something went wrong with that request. Please try again.