チェンジセット 103 : branches

更新日時:

2010/01/11 13:32:43 (2 年 前)

更新者:

h

ログメッセージ:

fixes #40
lwtheme使ってるかどうかの判定で例外が発生してたので修正。

パス:

branches/release-1.0

ファイル:

• chrome/content/vocalofx.js (変更) (2 diff)
• components/vocalofx-startup.js (変更) (3 diff)

branches/release-1.0/chrome/content/vocalofx.js

@@ -83 +83 @@
         }
         ,
+        isLWThemeUsed: function(){
+                var lwt_used;
+                try{
+                        lwt_used = this.pref.getBoolPref(this.MOZ_LWTHEME_USED);
+                }
+                catch(e){
+                        lwt_used = false;
+                }
+                return lwt_used;
+        }
+        ,
         setVocalofxSkinImage: function(){
-                if(this.pref.getBoolPref(this.MOZ_LWTHEME_USED) || this.lwt_preview){
+                if(this.isLWThemeUsed() || this.lwt_preview){
                         return;
                 }
@@ -508 +519 @@
                         break;
                         case this.MOZ_LWTHEME_USED:
-                                if(!this.pref.getBoolPref(this.MOZ_LWTHEME_USED)){
+                                if(!this.isLWThemeUsed()){
                                         this.setVocalofxSkinImage();
                                 }

branches/release-1.0/components/vocalofx-startup.js

@@ -163 +163 @@
                 const ALERT_THEME = "extensions.vocalofx.skin_theme_alert";
                 const DEFAULT_THEME = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
-                const MOZ_LWTHEME_USED = "lightweightThemes.isThemeSelected";
                 var installedAddons = new xpc.sptAry;
 
@@ -178 +177 @@
                 }
 
-                if(prefBrc2.getBoolPref(ALERT_THEME)
-                                 && (prefBrc2.getCharPref("general.skins.selectedSkin") != "classic/1.0")
-                                || prefBrc2.getBoolPref(MOZ_LWTHEME_USED)){
+                if(prefBrc2.getBoolPref(ALERT_THEME) && (prefBrc2.getCharPref("general.skins.selectedSkin") != "classic/1.0" || this.isLWThemeUsed())){
                         var string = new xpc.supportsString;
                         string.data = DEFAULT_THEME;
@@ -190 +187 @@
                         ww.openWindow(null, "chrome://vocalofx/content/alert.xul", "vocalofx-alert", "chrome,centerscreen,alwaysRaised=yes,modal=yes", installedAddons);
                 }
+        }
+        ,
+        isLWThemeUsed: function(){
+                const MOZ_LWTHEME_USED = "lightweightThemes.isThemeSelected";
+                var lwt_used;
+                try{
+                        lwt_used = prefBrc2.getBoolPref(MOZ_LWTHEME_USED);
+                }
+                catch(e){
+                        lwt_used = false;
+                }
+                return lwt_used;
         }
         ,