From cee5d24e7129b54e47c79da36b24684711a88283 Mon Sep 17 00:00:00 2001
From: foudfou <foudil.newbie+git@gmail.com>
Date: Tue, 18 Feb 2014 00:36:41 +0100
Subject: [PATCH] rename mail_urgency_hint pref to mail_get_attention

---
 src/chrome/content/options.xul      | 10 +++++-----
 src/chrome/locale/en-US/options.dtd |  4 ++--
 src/chrome/locale/es-AR/options.dtd |  4 ++--
 src/chrome/locale/fr/options.dtd    |  6 +++---
 src/chrome/locale/it/options.dtd    |  4 ++--
 src/chrome/locale/nl/options.dtd    |  4 ++--
 src/chrome/locale/sk-SK/options.dtd |  4 ++--
 src/chrome/locale/zh-TW/options.dtd |  4 ++--
 src/defaults/preferences/prefs.js   |  2 +-
 src/modules/FiretrayHandler.jsm     |  3 ++-
 src/modules/FiretrayMessaging.jsm   |  2 +-
 11 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 9c13423..caa64c4 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -136,7 +136,7 @@
       <preference id="pref_mail_accounts" name="extensions.firetray.mail_accounts" type="string"/>
       <preference id="pref_folder_count_recursive" name="extensions.firetray.folder_count_recursive" type="bool" />
       <preference id="pref_only_favorite_folders" name="extensions.firetray.only_favorite_folders" type="bool" />
-      <preference id="pref_mail_urgency_hint" name="extensions.firetray.mail_urgency_hint" type="bool" />
+      <preference id="pref_mail_get_attention" name="extensions.firetray.mail_get_attention" type="bool" />
     </preferences>
 
     <vbox align="left" flex="1">
@@ -300,10 +300,10 @@
                  observes="broadcaster-notification-disabled" />
       </hbox>
 
-      <checkbox id="ui_mail_urgency_hint"
-                label="&mail_urgency_hint.label;"
-                accesskey="&mail_urgency_hint.accesskey;"
-                preference="pref_mail_urgency_hint"
+      <checkbox id="ui_mail_get_attention"
+                label="&mail_get_attention.label;"
+                accesskey="&mail_get_attention.accesskey;"
+                preference="pref_mail_get_attention"
                 observes="broadcaster-notification-disabled"/>
 
     </vbox>
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index 070b087..aecb3d4 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -87,8 +87,8 @@
 <!ENTITY mail_change_trigger.accesskey "L">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "Absolute path of the program to run when the message count changes. This program will get the new message count as the first argument.">
-<!ENTITY mail_urgency_hint.label "Set X11 urgency hint">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "Window draws attention on new messages">
+<!ENTITY mail_get_attention.accesskey "g">
 
 <!ENTITY chat_icon_enable.label "Enable chat icon">
 <!ENTITY chat_icon_enable.accesskey "E">
diff --git a/src/chrome/locale/es-AR/options.dtd b/src/chrome/locale/es-AR/options.dtd
index cfea0ce..d2826b7 100644
--- a/src/chrome/locale/es-AR/options.dtd
+++ b/src/chrome/locale/es-AR/options.dtd
@@ -77,8 +77,8 @@
 <!ENTITY mail_change_trigger.accesskey "L">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "Ruta absoluta del programa para correr cuando la cuenta de mensajes cambia. Este programa obtendrá recibira el contador de nuevos mensajes como primer argumento.">
-<!ENTITY mail_urgency_hint.label "Set X11 urgency hint">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "Window draws attention on new messages">
+<!ENTITY mail_get_attention.accesskey "g">
 <!ENTITY chat_icon_enable.label "Habilitar ícono de chat">
 <!ENTITY chat_icon_enable.accesskey "H">
 <!ENTITY chat_icon_blink.label "Icono de chat parpadea con mensajes nuevos.">
diff --git a/src/chrome/locale/fr/options.dtd b/src/chrome/locale/fr/options.dtd
index 4241f8f..142fee5 100644
--- a/src/chrome/locale/fr/options.dtd
+++ b/src/chrome/locale/fr/options.dtd
@@ -77,10 +77,10 @@
 <!ENTITY mail_change_trigger.accesskey "L">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "Chemin absolu du programme à lancer lorsque le compte des messages a changé. Ce programme prendra pour base le nouveau décompte de messages">
-<!ENTITY mail_urgency_hint.label "Activer l'indice d'urgence X11">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "La fenêtre attire l'attention lors de nouveaux messages">
+<!ENTITY mail_get_attention.accesskey "e">
 <!ENTITY chat_icon_enable.label "Activer l'icône du chat">
-<!ENTITY chat_icon_enable.accesskey "A">
+<!ENTITY chat_icon_enable.accesskey "h">
 <!ENTITY chat_icon_blink.label "L'icône du chat clignote à l'arrivée de nouveaux messages">
 <!ENTITY chat_icon_blink.accesskey "i">
 <!ENTITY chat_icon_blink.tooltip "quand un message privé est cité sur un canal">
diff --git a/src/chrome/locale/it/options.dtd b/src/chrome/locale/it/options.dtd
index 38bb1e6..c00844b 100644
--- a/src/chrome/locale/it/options.dtd
+++ b/src/chrome/locale/it/options.dtd
@@ -77,8 +77,8 @@
 <!ENTITY mail_change_trigger.accesskey "L">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "Percorso assoluto del programma da lanciare quando viene incrementato il contatore dei messaggi non letti. Il programma utilizzerà il contatore dei nuovi messaggi come primo argomento.">
-<!ENTITY mail_urgency_hint.label "Set X11 urgency hint">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "Window draws attention on new messages">
+<!ENTITY mail_get_attention.accesskey "g">
 <!ENTITY chat_icon_enable.label "Attiva icona della chat">
 <!ENTITY chat_icon_enable.accesskey "E">
 <!ENTITY chat_icon_blink.label "Lampeggiamento dell'icona della chat per nuovi messaggi">
diff --git a/src/chrome/locale/nl/options.dtd b/src/chrome/locale/nl/options.dtd
index 4fe78ab..723eacf 100644
--- a/src/chrome/locale/nl/options.dtd
+++ b/src/chrome/locale/nl/options.dtd
@@ -77,8 +77,8 @@
 <!ENTITY mail_change_trigger.accesskey "S">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "Absoluut pad van het uit te voeren programma wanneer het aantal wijzigt. Dit programma krijgt het aantal nieuwe berichten als het eerste argument.">
-<!ENTITY mail_urgency_hint.label "Set X11 urgency hint">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "Window draws attention on new messages">
+<!ENTITY mail_get_attention.accesskey "g">
 <!ENTITY chat_icon_enable.label "Chatpictogram inschakelen">
 <!ENTITY chat_icon_enable.accesskey "s">
 <!ENTITY chat_icon_blink.label "Chatpictogram knippert bij nieuwe berichten">
diff --git a/src/chrome/locale/sk-SK/options.dtd b/src/chrome/locale/sk-SK/options.dtd
index 2f34358..2c6c6df 100644
--- a/src/chrome/locale/sk-SK/options.dtd
+++ b/src/chrome/locale/sk-SK/options.dtd
@@ -87,8 +87,8 @@
 <!ENTITY mail_change_trigger.accesskey "S">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "Absolútna cesta programu, ktorý bude spustený pri zmene počtu správ. Prvý argument je počet nových správ.">
-<!ENTITY mail_urgency_hint.label "Set X11 urgency hint">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "Window draws attention on new messages">
+<!ENTITY mail_get_attention.accesskey "g">
 
 <!ENTITY chat_icon_enable.label "Zapnúť ikonu chatu">
 <!ENTITY chat_icon_enable.accesskey "E">
diff --git a/src/chrome/locale/zh-TW/options.dtd b/src/chrome/locale/zh-TW/options.dtd
index 18ab34a..759f560 100644
--- a/src/chrome/locale/zh-TW/options.dtd
+++ b/src/chrome/locale/zh-TW/options.dtd
@@ -77,8 +77,8 @@
 <!ENTITY mail_change_trigger.accesskey "L">
 <!ENTITY mail_change_trigger.placeholder "/bin/notify-send">
 <!ENTITY mail_change_trigger.tooltip "要在訊息數改變時執行程式的絕對路徑。程式會將新的訊息數作為第一個參數。">
-<!ENTITY mail_urgency_hint.label "Set X11 urgency hint">
-<!ENTITY mail_urgency_hint.accesskey "X">
+<!ENTITY mail_get_attention.label "Window draws attention on new messages">
+<!ENTITY mail_get_attention.accesskey "g">
 <!ENTITY chat_icon_enable.label "啟用聊天圖示">
 <!ENTITY chat_icon_enable.accesskey "E">
 <!ENTITY chat_icon_blink.label "有新訊息時閃爍聊天圖示">
diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index aa2191f..a0a66cd 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -25,7 +25,7 @@ pref("extensions.firetray.chat_icon_enable", true);
 pref("extensions.firetray.chat_icon_blink", true);
 pref("extensions.firetray.chat_icon_blink_style", 0);
 
-pref("extensions.firetray.mail_urgency_hint", true);
+pref("extensions.firetray.mail_get_attention", true);
 pref("extensions.firetray.message_count_type", 0);
 pref("extensions.firetray.mail_notification_enabled", true);
 pref("extensions.firetray.mail_notification_type", 0);
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 9c28084..941ee5b 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -685,7 +685,8 @@ firetray.VersionChangeHandler = {
       "text_color", "scroll_to_hide", "scroll_action", "grab_multimedia_keys",
       "hide_show_mm_key", "accounts_to_exclude" ];
     let v040b2Options = [ 'mail_notification' ];
-    let oldOptions = v03Options.concat(v040b2Options);
+    let v050Options = [ 'mail_urgency_hint' ];
+    let oldOptions = v03Options.concat(v040b2Options).concat(v050Options);
 
     for (let i = 0, length = oldOptions.length; i<length; ++i) {
       try {
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index 6b06e89..586a388 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -183,7 +183,7 @@ firetray.Messaging = {
           if (mailChangeTriggerFile)
             firetray.Messaging.runProcess(mailChangeTriggerFile, [newMsgCount.toString()]);
 
-          let getAttention = firetray.Utils.prefService.getBoolPref("mail_urgency_hint"); // FIXME: rename!
+          let getAttention = firetray.Utils.prefService.getBoolPref("mail_get_attention");
           if (getAttention && (newMsgCount > currentMsgCount))
             for (let winId in firetray.Handler.windows)
               firetray.Handler.windowGetAttention(winId);