Changeset 2571 for trunk/digitalme/launchers

Timestamp:

04/09/09 09:00:39 (16 months ago)

Author:

ahodgkinson

Message:

Updated firefox add-on and renamed gPrefService to gIcPrefService.

Location:

trunk/digitalme/launchers/firefox-addon/xul/chrome/content

Files:

• DigitalMePrefs.js (modified) (9 diffs)
• IdentitySelectorPrefs.js (modified) (6 diffs)
• IdentitySelectorUtil.js (modified) (1 diff)

trunk/digitalme/launchers/firefox-addon/xul/chrome/content/DigitalMePrefs.js

@@ -22 +22 @@
 // **************************************************************************
 
-var gPrefService = Components.classes[ 
+var gIcPrefService = Components.classes[ 
                 "@mozilla.org/preferences-service;1"].
                         getService( Components.interfaces.nsIPrefBranch);
@@ -43 +43 @@
                         try
                         { 
-                                element.value = gPrefService.getCharPref( 
+                                element.value = gIcPrefService.getCharPref( 
                                         "extensions.digitalme.exe.path"); 
                         }
@@ -58 +58 @@
                         try
                         { 
-                                element.checked = gPrefService.getBoolPref( 
+                                element.checked = gIcPrefService.getBoolPref( 
                                         "extensions.digitalme.logging.enabled"); 
                         }
@@ -72 +72 @@
                         try
                         { 
-                                element.value = gPrefService.getCharPref( 
+                                element.value = gIcPrefService.getCharPref( 
                                         "extensions.digitalme.debug.log.path"); 
                         }
@@ -87 +87 @@
                         try
                         { 
-                                element.checked = gPrefService.getBoolPref( 
+                                element.checked = gIcPrefService.getBoolPref( 
                                         "extensions.digitalme.security.securedesktop"); 
                         }
@@ -110 +110 @@
                         element = document.getElementById( 
                                                         "digitalme.exe.path");
-                        gPrefService.setCharPref( 
+                        gIcPrefService.setCharPref( 
                                                         "extensions.digitalme.exe.path", 
                                                         element.value);
@@ -118 +118 @@
                         element = document.getElementById( 
                                                         "digitalme.logging.enabled");
-                        gPrefService.setBoolPref( 
+                        gIcPrefService.setBoolPref( 
                                                         "extensions.digitalme.logging.enabled",
                                                         element.checked);
@@ -126 +126 @@
                         element = document.getElementById( 
                                                         "digitalme.debug.log.path");
-                        gPrefService.setCharPref( 
+                        gIcPrefService.setCharPref( 
                                                         "extensions.digitalme.debug.log.path",
                                                         element.value);
@@ -134 +134 @@
                         element = document.getElementById( 
                                                         "digitalme.security.securedesktop");
-                        gPrefService.setBoolPref( 
+                        gIcPrefService.setBoolPref( 
                                                         "extensions.digitalme.security.securedesktop", 
                                                         element.checked);

trunk/digitalme/launchers/firefox-addon/xul/chrome/content/IdentitySelectorPrefs.js

@@ -22 +22 @@
 // **************************************************************************
 
-var gPrefService = Components.classes[ 
+var gIcPrefService = Components.classes[ 
                 "@mozilla.org/preferences-service;1"].
                         getService( Components.interfaces.nsIPrefBranch);
@@ -40 +40 @@
                 var fullPrefId = "extensions." + componentId + "." + prefId;
                 
-                if( gPrefService.getPrefType( fullPrefId) != gPrefService.PREF_INVALID)
+                if( gIcPrefService.getPrefType( fullPrefId) != gIcPrefService.PREF_INVALID)
                 {
                         return( true);
@@ -56 +56 @@
                 var fullPrefId = "extensions." + componentId + "." + prefId;
                 
-                if( gPrefService.getPrefType( fullPrefId) == gPrefService.PREF_STRING)
+                if( gIcPrefService.getPrefType( fullPrefId) == gIcPrefService.PREF_STRING)
                 {
-                        return( gPrefService.getCharPref( fullPrefId));
+                        return( gIcPrefService.getCharPref( fullPrefId));
                 }
                 
@@ -71 +71 @@
         {
                 var fullPrefId = "extensions." + componentId + "." + prefId;
-                gPrefService.setCharPref( fullPrefId, prefValue);
+                gIcPrefService.setCharPref( fullPrefId, prefValue);
         },
         
@@ -82 +82 @@
                 var fullPrefId = "extensions." + componentId + "." + prefId;
                 
-                if( gPrefService.getPrefType( fullPrefId) == gPrefService.PREF_BOOL)
+                if( gIcPrefService.getPrefType( fullPrefId) == gIcPrefService.PREF_BOOL)
                 {
-                        return( gPrefService.getBoolPref( fullPrefId));
+                        return( gIcPrefService.getBoolPref( fullPrefId));
                 }
                 
@@ -97 +97 @@
         {
                 var fullPrefId = "extensions." + componentId + "." + prefId;
-                gPrefService.setBoolPref( fullPrefId, prefValue);
+                gIcPrefService.setBoolPref( fullPrefId, prefValue);
         }
 };

trunk/digitalme/launchers/firefox-addon/xul/chrome/content/IdentitySelectorUtil.js

@@ -66 +66 @@
         isJavaScriptEnabled : function()
         {
-                return( gPrefService.getBoolPref( "javascript.enabled"));
+                return( gIcPrefService.getBoolPref( "javascript.enabled"));
         },