[Pkg-mozext-commits] [firetray] 23/33: Fix pref window initialization with appindicator.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit d5cea437eeed17e7b85df0410b856d9af1520117
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Sep 7 23:48:56 2015 +0200

    Fix pref window initialization with appindicator.
---
 src/chrome/content/options.js | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 95bd573..72fa986 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -29,23 +29,6 @@ var firetrayUIOptions = {
     if (!this.prefwindow)
       log.error("pref window not found");
 
-    if (firetray.Handler.inMailApp) {
-      Cu.import("resource:///modules/mailServices.js");
-      Cu.import("resource://firetray/FiretrayMessaging.jsm");
-      this.initMailControls();
-    } else {
-      this.removePrefPane("pref-pane-mail");
-    }
-
-    if (firetray.Handler.isChatProvided() &&
-        firetray.Handler.support['chat'] &&
-        !firetray.AppIndicator) {
-      Cu.import("resource://firetray/"+firetray.Handler.app.OS+"/FiretrayChat.jsm");
-      this.initChatControls();
-    } else {
-      this.removePrefPane("pref-pane-chat");
-    };
-
     this.updateWindowAndIconOptions();
     this.updateScrollOptions();
     this.initAppIconType();
@@ -66,6 +49,23 @@ var firetrayUIOptions = {
         this.initNewMailIconNames();
     }
 
+    if (firetray.Handler.inMailApp) {
+      Cu.import("resource:///modules/mailServices.js");
+      Cu.import("resource://firetray/FiretrayMessaging.jsm");
+      this.initMailControls();
+    } else {
+      this.removePrefPane("pref-pane-mail");
+    }
+
+    if (firetray.Handler.isChatProvided() &&
+        firetray.Handler.support['chat'] &&
+        !firetray.AppIndicator) {
+      Cu.import("resource://firetray/"+firetray.Handler.app.OS+"/FiretrayChat.jsm");
+      this.initChatControls();
+    } else {
+      this.removePrefPane("pref-pane-chat");
+    };
+
     window.sizeToContent();
   },
 
@@ -119,7 +119,8 @@ var firetrayUIOptions = {
     let pane = document.getElementById(name);
     pane.parentNode.removeChild(pane);
 
-    let radio = document.getAnonymousElementByAttribute(this.prefwindow, "pane", name);
+    let radio = document
+      .getAnonymousElementByAttribute(this.prefwindow, "pane", name);
     radio.parentNode.removeChild(radio);
   },
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git