Add irc and jabber options to display nick modes in input_prompt bar item

18 files changed, 139 insertions, 9 deletions

diff --git a/doc/de/autogen/irc_options.xml b/doc/de/autogen/irc_options.xml
index ed0bcd00c..6aaee96fb 100644
--- a/doc/de/autogen/irc_options.xml
+++ b/doc/de/autogen/irc_options.xml
@@ -66,6 +66,16 @@
   </listitem>
 </itemizedlist>
 
+<command>irc.look.display_nick_modes</command>: display nick modes in "input_prompt" bar item
+<itemizedlist>
+  <listitem>
+    <para>type: boolean</para>
+  </listitem>
+  <listitem>
+    <para>values: on, off (default value: on)</para>
+  </listitem>
+</itemizedlist>
+
 <command>irc.look.hide_nickserv_pwd</command>: Von NickServ angezeigte Passwörter verstecken
 <itemizedlist>
   <listitem>
diff --git a/doc/de/autogen/jabber_options.xml b/doc/de/autogen/jabber_options.xml
index 737b7753f..c3150a007 100644
--- a/doc/de/autogen/jabber_options.xml
+++ b/doc/de/autogen/jabber_options.xml
@@ -66,6 +66,16 @@
   </listitem>
 </itemizedlist>
 
+<command>jabber.look.display_nick_modes</command>: display nick modes in "input_prompt" bar item
+<itemizedlist>
+  <listitem>
+    <para>type: boolean</para>
+  </listitem>
+  <listitem>
+    <para>values: on, off (default value: on)</para>
+  </listitem>
+</itemizedlist>
+
 <command>jabber.look.highlight_tags</command>: comma separated list of tags for messages that may produce highlight (usually any message from another user, not server messages,..)
 <itemizedlist>
   <listitem>
diff --git a/doc/en/autogen/irc_options.xml b/doc/en/autogen/irc_options.xml
index b670d6c18..e951402f6 100644
--- a/doc/en/autogen/irc_options.xml
+++ b/doc/en/autogen/irc_options.xml
@@ -66,6 +66,16 @@
   </listitem>
 </itemizedlist>
 
+<command>irc.look.display_nick_modes</command>: display nick modes in "input_prompt" bar item
+<itemizedlist>
+  <listitem>
+    <para>type: boolean</para>
+  </listitem>
+  <listitem>
+    <para>values: on, off (default value: on)</para>
+  </listitem>
+</itemizedlist>
+
 <command>irc.look.hide_nickserv_pwd</command>: hide password displayed by nickserv
 <itemizedlist>
   <listitem>
diff --git a/doc/en/autogen/jabber_options.xml b/doc/en/autogen/jabber_options.xml
index 5bd5cf9e8..72a51ce60 100644
--- a/doc/en/autogen/jabber_options.xml
+++ b/doc/en/autogen/jabber_options.xml
@@ -66,6 +66,16 @@
   </listitem>
 </itemizedlist>
 
+<command>jabber.look.display_nick_modes</command>: display nick modes in "input_prompt" bar item
+<itemizedlist>
+  <listitem>
+    <para>type: boolean</para>
+  </listitem>
+  <listitem>
+    <para>values: on, off (default value: on)</para>
+  </listitem>
+</itemizedlist>
+
 <command>jabber.look.highlight_tags</command>: comma separated list of tags for messages that may produce highlight (usually any message from another user, not server messages,..)
 <itemizedlist>
   <listitem>
diff --git a/doc/fr/autogen/irc_options.xml b/doc/fr/autogen/irc_options.xml
index ab18147b1..825cc90db 100644
--- a/doc/fr/autogen/irc_options.xml
+++ b/doc/fr/autogen/irc_options.xml
@@ -66,6 +66,16 @@
   </listitem>
 </itemizedlist>
 
+<command>irc.look.display_nick_modes</command>: affiche les modes du pseudo dans l'objet de barre "input_prompt"
+<itemizedlist>
+  <listitem>
+    <para>type: booléen</para>
+  </listitem>
+  <listitem>
+    <para>valeurs: on, off (valeur par défaut: on)</para>
+  </listitem>
+</itemizedlist>
+
 <command>irc.look.hide_nickserv_pwd</command>: masquer le mot de passe affiché par nickserv
 <itemizedlist>
   <listitem>
diff --git a/doc/fr/autogen/jabber_options.xml b/doc/fr/autogen/jabber_options.xml
index d584406d6..099d6efc7 100644
--- a/doc/fr/autogen/jabber_options.xml
+++ b/doc/fr/autogen/jabber_options.xml
@@ -66,6 +66,16 @@
   </listitem>
 </itemizedlist>
 
+<command>jabber.look.display_nick_modes</command>: affiche les modes du pseudo dans l'objet de barre "input_prompt"
+<itemizedlist>
+  <listitem>
+    <para>type: booléen</para>
+  </listitem>
+  <listitem>
+    <para>valeurs: on, off (valeur par défaut: on)</para>
+  </listitem>
+</itemizedlist>
+
 <command>jabber.look.highlight_tags</command>: liste des tags pour les messages qui peuvent produire un highlight (séparés par des virgules, typiquement tout message venant d'un autre utilisateur, pas les messages du serveur, ...)
 <itemizedlist>
   <listitem>
diff --git a/po/cs.po b/po/cs.po
index 97a536b3f..1a8df3b8b 100644
--- a/po/cs.po
+++ b/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: 2009-02-10 12:42+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3487,6 +3487,9 @@ msgstr "zobrazit zprávu, když označen/odznačen jako nepřítomen"
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
 msgid "hide password displayed by nickserv"
 msgstr "schovat heslo zobrazené nickservem"
 
diff --git a/po/de.po b/po/de.po
index a7daaf719..e1bff02fd 100644
--- a/po/de.po
+++ b/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: 2009-02-10 12:42+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3471,6 +3471,9 @@ msgstr "bei Abwesenheit und Rückkehr eine Nachricht anzeigen"
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
 msgid "hide password displayed by nickserv"
 msgstr "Von NickServ angezeigte Passwörter verstecken"
 
diff --git a/po/es.po b/po/es.po
index 109bae428..6e9f6b2d1 100644
--- a/po/es.po
+++ b/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: 2009-02-10 12:42+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3458,6 +3458,9 @@ msgstr "mostrar mensaje cuando se marque/desmarque como ausente"
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
 msgid "hide password displayed by nickserv"
 msgstr "ocultar contraseña mostrada por nickserv"
 
diff --git a/po/fr.po b/po/fr.po
index 24f577740..4cdff1356 100644
--- a/po/fr.po
+++ b/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: 2009-02-10 12:42+0100\n"
-"PO-Revision-Date: 2009-02-10 12:44+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+0100\n"
+"PO-Revision-Date: 2009-02-11 09:56+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -3597,6 +3597,9 @@ msgstr "affiche un message pour l'absence/le retour"
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr "affiche les modes du canal dans l'objet de barre \"buffer_name\""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "affiche les modes du pseudo dans l'objet de barre \"input_prompt\""
+
 msgid "hide password displayed by nickserv"
 msgstr "masquer le mot de passe affiché par nickserv"
 
diff --git a/po/hu.po b/po/hu.po
index d4debb2be..a0923160e 100644
--- a/po/hu.po
+++ b/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: 2009-02-10 12:42+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3506,6 +3506,9 @@ msgstr "üzenet mutatása távollétkor/visszatéréskor"
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
 msgid "hide password displayed by nickserv"
 msgstr "a nickserv által mutatott jelszó elrejtése"
 
diff --git a/po/ru.po b/po/ru.po
index 06cc97510..3edbe1f15 100644
--- a/po/ru.po
+++ b/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: 2009-02-10 12:42+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+0100\n"
 "PO-Revision-Date: 2009-01-03 00:42+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3499,6 +3499,9 @@ msgstr "показывать сообщение во все каналы при
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
 msgid "hide password displayed by nickserv"
 msgstr "скрывать пароль, отображаемый nickserv'ом"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index d8c9ad602..f6bec9687 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-02-10 12:42+0100\n"
+"POT-Creation-Date: 2009-02-11 09:56+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"
@@ -2973,6 +2973,9 @@ msgstr ""
 msgid "display channel modes in \"buffer_name\" bar item"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
 msgid "hide password displayed by nickserv"
 msgstr ""
 
diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c
index 3e6bec735..043b669d8 100644
--- a/src/plugins/irc/irc-bar-item.c
+++ b/src/plugins/irc/irc-bar-item.c
@@ -249,7 +249,8 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item,
         buf = malloc (length);
         if (buf)
         {
-            if (server->nick_modes && server->nick_modes[0])
+            if (weechat_config_boolean (irc_config_look_display_nick_modes)
+                && server->nick_modes && server->nick_modes[0])
             {
                 snprintf (buf, length, "%s%s%s(%s%s%s)",
                           IRC_COLOR_INPUT_NICK,
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 8ced94784..9be9faa5b 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -50,6 +50,7 @@ struct t_config_option *irc_config_look_nick_suffix;
 struct t_config_option *irc_config_look_nick_completion_smart;
 struct t_config_option *irc_config_look_display_away;
 struct t_config_option *irc_config_look_display_channel_modes;
+struct t_config_option *irc_config_look_display_nick_modes;
 struct t_config_option *irc_config_look_hide_nickserv_pwd;
 struct t_config_option *irc_config_look_highlight_tags;
 struct t_config_option *irc_config_look_show_away_once;
@@ -184,6 +185,22 @@ irc_config_change_look_display_channel_modes (void *data,
 }
 
 /*
+ * irc_config_change_look_display_nick_modes: called when the "display
+ *                                            nick modes" option is changed
+ */
+
+void
+irc_config_change_look_display_nick_modes (void *data,
+                                           struct t_config_option *option)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+    
+    weechat_bar_item_update ("input_prompt");
+}
+
+/*
  * irc_config_change_look_highlight_tags: called when the "highlight tags"
  *                                        option is changed
  */
@@ -1038,6 +1055,12 @@ irc_config_init ()
         N_("display channel modes in \"buffer_name\" bar item"),
         NULL, 0, 0, "on", NULL, 0, NULL, NULL,
         &irc_config_change_look_display_channel_modes, NULL, NULL, NULL);
+    irc_config_look_display_nick_modes = weechat_config_new_option (
+        irc_config_file, ptr_section,
+        "display_nick_modes", "boolean",
+        N_("display nick modes in \"input_prompt\" bar item"),
+        NULL, 0, 0, "on", NULL, 0, NULL, NULL,
+        &irc_config_change_look_display_nick_modes, NULL, NULL, NULL);
     irc_config_look_hide_nickserv_pwd = weechat_config_new_option (
         irc_config_file, ptr_section,
         "hide_nickserv_pwd", "boolean",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index 2ea24f5fc..23dbcc98c 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -39,6 +39,7 @@ extern struct t_config_option *irc_config_look_nick_suffix;
 extern struct t_config_option *irc_config_look_nick_completion_smart;
 extern struct t_config_option *irc_config_look_display_away;
 extern struct t_config_option *irc_config_look_display_channel_modes;
+extern struct t_config_option *irc_config_look_display_nick_modes;
 extern struct t_config_option *irc_config_look_hide_nickserv_pwd;
 extern struct t_config_option *irc_config_look_highlight_tags;
 extern struct t_config_option *irc_config_look_show_away_once;
diff --git a/src/plugins/jabber/jabber-config.c b/src/plugins/jabber/jabber-config.c
index cb8c56459..c989978b1 100644
--- a/src/plugins/jabber/jabber-config.c
+++ b/src/plugins/jabber/jabber-config.c
@@ -49,6 +49,7 @@ struct t_config_option *jabber_config_look_nick_suffix;
 struct t_config_option *jabber_config_look_nick_completion_smart;
 struct t_config_option *jabber_config_look_display_away;
 struct t_config_option *jabber_config_look_display_muc_modes;
+struct t_config_option *jabber_config_look_display_nick_modes;
 struct t_config_option *jabber_config_look_highlight_tags;
 struct t_config_option *jabber_config_look_show_away_once;
 struct t_config_option *jabber_config_look_smart_filter;
@@ -183,6 +184,22 @@ jabber_config_change_look_display_muc_modes (void *data,
 }
 
 /*
+ * jabber_config_change_look_display_nick_modes: called when the "display
+ *                                               nick modes" option is changed
+ */
+
+void
+jabber_config_change_look_display_nick_modes (void *data,
+                                              struct t_config_option *option)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+    
+    weechat_bar_item_update ("input_prompt");
+}
+
+/*
  * jabber_config_change_look_highlight_tags: called when the "highlight tags"
  *                                           option is changed
  */
@@ -784,6 +801,12 @@ jabber_config_init ()
         N_("display MUC modes in \"buffer_name\" bar item"),
         NULL, 0, 0, "on", NULL, 0, NULL, NULL,
         &jabber_config_change_look_display_muc_modes, NULL, NULL, NULL);
+    jabber_config_look_display_nick_modes = weechat_config_new_option (
+        jabber_config_file, ptr_section,
+        "display_nick_modes", "boolean",
+        N_("display nick modes in \"input_prompt\" bar item"),
+        NULL, 0, 0, "on", NULL, 0, NULL, NULL,
+        &jabber_config_change_look_display_nick_modes, NULL, NULL, NULL);
     jabber_config_look_highlight_tags = weechat_config_new_option (
         jabber_config_file, ptr_section,
         "highlight_tags", "string",
diff --git a/src/plugins/jabber/jabber-config.h b/src/plugins/jabber/jabber-config.h
index a97e839de..129144a26 100644
--- a/src/plugins/jabber/jabber-config.h
+++ b/src/plugins/jabber/jabber-config.h
@@ -39,6 +39,7 @@ extern struct t_config_option *jabber_config_look_nick_suffix;
 extern struct t_config_option *jabber_config_look_nick_completion_smart;
 extern struct t_config_option *jabber_config_look_display_away;
 extern struct t_config_option *jabber_config_look_display_muc_modes;
+extern struct t_config_option *jabber_config_look_display_nick_modes;
 extern struct t_config_option *jabber_config_look_highlight_tags;
 extern struct t_config_option *jabber_config_look_show_away_once;
 extern struct t_config_option *jabber_config_look_smart_filter;