Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/install.rdf
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/install.rdf (revision 19722)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/install.rdf (revision 20183)
@@ -5,5 +5,5 @@
     <em:id>{77cc852e-6b45-11dd-929f-d30256d89593}</em:id>
     <em:name>FireMobileSimulator</em:name>
-    <em:version>0.1.4</em:version>
+    <em:version>0.1.4.1b</em:version>
     <em:creator>Takahiro Horikawa</em:creator>
     <em:aboutURL>chrome://msim/content/about.xul</em:aboutURL>
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/components/msimModifyHeaders.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/components/msimModifyHeaders.js (revision 19719)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/components/msimModifyHeaders.js (revision 20183)
@@ -38,13 +38,13 @@
 
 	observe : function(subject, topic, data) {
-		var carrier = pref.copyUnicharPref("msim.current.carrier");
+		var carrier = msim_pref.copyUnicharPref("msim.current.carrier");
 		if (carrier) {
 
-			var registFlag = pref.getBoolPref("msim.config.regist.enabled");
+			var registFlag = msim_pref.getBoolPref("msim.config.regist.enabled");
 
 			if (topic == "http-on-modify-request") {
 				var httpChannel = subject.QueryInterface(Ci.nsIHttpChannel);
-				var device = pref.copyUnicharPref("msim.current.device");
-				var id = pref.copyUnicharPref("msim.current.id");
+				var device = msim_pref.copyUnicharPref("msim.current.device");
+				var id = msim_pref.copyUnicharPref("msim.current.id");
 
 				httpChannel.setRequestHeader("x-msim-use", "on", false);
@@ -57,13 +57,13 @@
 					var qs = "";
 
-					var uid = pref.copyUnicharPref("msim.config.DC.uid");
-					var ser = pref.copyUnicharPref("msim.config.DC.ser");
-					var icc = pref.copyUnicharPref("msim.config.DC.icc");
-					var guid = pref.copyUnicharPref("msim.config.DC.guid");
+					var uid = msim_pref.copyUnicharPref("msim.config.DC.uid");
+					var ser = msim_pref.copyUnicharPref("msim.config.DC.ser");
+					var icc = msim_pref.copyUnicharPref("msim.config.DC.icc");
+					var guid = msim_pref.copyUnicharPref("msim.config.DC.guid");
 
 					// UTN
-					var utnFlag = pref.getBoolPref("msim.temp.utnflag");
+					var utnFlag = msim_pref.getBoolPref("msim.temp.utnflag");
 					if (true == utnFlag) {
-						var userAgent = pref
+						var userAgent = msim_pref
 								.copyUnicharPref("msim.current.useragent");
 
@@ -112,12 +112,12 @@
 					}
 
-					var lcsFlag = pref.getBoolPref("msim.temp.lcsflag");
+					var lcsFlag = msim_pref.getBoolPref("msim.temp.lcsflag");
 					if (true == lcsFlag) {
 						dump("[msim]add GPS info for DoCoMo\n");
-						var lat = pref
+						var lat = msim_pref
 								.copyUnicharPref("msim.config.DC.gps.lat");
-						var lon = pref
+						var lon = msim_pref
 								.copyUnicharPref("msim.config.DC.gps.lon");
-						var alt = pref
+						var alt = msim_pref
 								.copyUnicharPref("msim.config.DC.gps.alt");
 						if (parts.length >= 2) {
@@ -131,5 +131,5 @@
 						}
 						rewriteFlag = true;
-						pref.setBoolPref("msim.temp.lcsflag", false);
+						msim_pref.setBoolPref("msim.temp.lcsflag", false);
 					}
 
@@ -152,9 +152,9 @@
 					}
 				} else if (carrier == "SB") {
-					httpChannel.setRequestHeader("x-jphone-uid", pref
+					httpChannel.setRequestHeader("x-jphone-uid", msim_pref
 									.copyUnicharPref("msim.config.SB.uid"),
 							false);
 				} else if (carrier == "AU") {
-					httpChannel.setRequestHeader("x-up-subno", pref
+					httpChannel.setRequestHeader("x-up-subno", msim_pref
 									.copyUnicharPref("msim.config.AU.uid"),
 							false);
@@ -180,5 +180,5 @@
 				for (var i = 0; i < deviceAttribute[carrier].length; i++) {
 					var a = deviceAttribute[carrier][i];
-					var value = pref.copyUnicharPref("msim.devicelist."
+					var value = msim_pref.copyUnicharPref("msim.devicelist."
 							+ carrier + "." + id + "." + a);
 					if (value) {
@@ -194,5 +194,5 @@
 				// dump("msim:topic is "+topic+"\n");
 				var newContentType = "";
-				var pictogramConverterEnabled = pref.getBoolPref("msim.config."+carrier+".pictogram.enabled");
+				var pictogramConverterEnabled = msim_pref.getBoolPref("msim.config."+carrier+".pictogram.enabled");
 				if (pictogramConverterEnabled) {
 					newContentType = "text/msim.html";
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/components/msimStreamConverter.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/components/msimStreamConverter.js (revision 19719)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/components/msimStreamConverter.js (revision 20183)
@@ -75,5 +75,5 @@
 	dump("[msim]onStopRequest\n");
 
-	var carrier = pref.copyUnicharPref("msim.current.carrier");
+	var carrier = msim_pref.copyUnicharPref("msim.current.carrier");
 
 	//絵文字変換
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/about.xul
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/about.xul (revision 19722)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/about.xul (revision 20183)
@@ -28,5 +28,5 @@
 <vbox>
   <label value="FireMobileSimulator" style="font-weight: bold; font-size: x-large;"/>
-  <label value="&version; 0.1.4"/>
+  <label value="&version; 0.1.4.1b"/>
   <separator class="thin"/>
   <label value="&createdBy;" style="font-weight: bold;"/>
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/dc_openiarea.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/dc_openiarea.js (revision 19719)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/dc_openiarea.js (revision 20183)
@@ -28,8 +28,8 @@
 
 	var openiareaBody = document.getElementById("openiarea_body");
-	var areaname = pref.copyUnicharPref("msim.config.DC.gps.areaname");
-	var areacode = pref.copyUnicharPref("msim.config.DC.gps.areacode");
-	var lat = pref.copyUnicharPref("msim.config.DC.gps.lat");
-	var lon = pref.copyUnicharPref("msim.config.DC.gps.lon");
+	var areaname = msim_pref.copyUnicharPref("msim.config.DC.gps.areaname");
+	var areacode = msim_pref.copyUnicharPref("msim.config.DC.gps.areacode");
+	var lat = msim_pref.copyUnicharPref("msim.config.DC.gps.lat");
+	var lon = msim_pref.copyUnicharPref("msim.config.DC.gps.lon");
 
 	if(!posinfo){
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/au_gps.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/au_gps.js (revision 19719)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/au_gps.js (revision 20183)
@@ -20,6 +20,6 @@
 function auLocationInit(params) {
 	var href = location.href;
-	var lat = encodeURIComponent(pref.copyUnicharPref("msim.config.AU.gps.lat"));
-	var lon = encodeURIComponent(pref.copyUnicharPref("msim.config.AU.gps.lon"));
+	var lat = encodeURIComponent(msim_pref.copyUnicharPref("msim.config.AU.gps.lat"));
+	var lon = encodeURIComponent(msim_pref.copyUnicharPref("msim.config.AU.gps.lon"));
 
 	if(href.indexOf("device:location") == 0){
@@ -31,10 +31,10 @@
 		var datum = params["datum"]; // 測地系
 		var unit  = params["unit"]; // 緯度経度表記方法
-		var alt   = pref.copyUnicharPref("msim.config.AU.gps.alt") || 50; //海抜高度
+		var alt   = msim_pref.copyUnicharPref("msim.config.AU.gps.alt") || 50; //海抜高度
 		var time  = getYYYYMMDDHHmm();
-		var smaj  = pref.copyUnicharPref("msim.config.AU.gps.smaj") || 100; //長軸成分誤差
-		var smin  = pref.copyUnicharPref("msim.config.AU.gps.smin") || 100; //短軸成分誤差
-		var vert  = pref.copyUnicharPref("msim.config.AU.gps.vert") || 100; //高度誤差
-		var majaa = pref.copyUnicharPref("msim.config.AU.gps.majaa") || 60; //長軸短軸傾き値
+		var smaj  = msim_pref.copyUnicharPref("msim.config.AU.gps.smaj") || 100; //長軸成分誤差
+		var smin  = msim_pref.copyUnicharPref("msim.config.AU.gps.smin") || 100; //短軸成分誤差
+		var vert  = msim_pref.copyUnicharPref("msim.config.AU.gps.vert") || 100; //高度誤差
+		var majaa = msim_pref.copyUnicharPref("msim.config.AU.gps.majaa") || 60; //長軸短軸傾き値
 		var fm = 1; //測位結果の精度
 
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/carrier.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/carrier.js (revision 19719)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/carrier.js (revision 20183)
@@ -56,24 +56,24 @@
 
 	var pref_prefix = "msim.devicelist." + carrier + "." + id;
-	pref.setUnicharPref("msim.current.carrier", pref
+	msim_pref.setUnicharPref("msim.current.carrier", msim_pref
 					.copyUnicharPref(pref_prefix + ".carrier"));
-	pref.setUnicharPref("msim.current.device", pref.copyUnicharPref(pref_prefix
+	msim_pref.setUnicharPref("msim.current.device", msim_pref.copyUnicharPref(pref_prefix
 					+ ".device"));
 
-	var useragent = pref.copyUnicharPref(pref_prefix + ".useragent");
+	var useragent = msim_pref.copyUnicharPref(pref_prefix + ".useragent");
 	if (SOFTBANK == carrier) {
-		useragent = getSoftBankUserAgent(useragent, pref
+		useragent = getSoftBankUserAgent(useragent, msim_pref
 						.copyUnicharPref("msim.config.SB.serial"));
 	}
 
-	pref.setUnicharPref("general.useragent.override", useragent);
-	pref.setUnicharPref("msim.current.useragent", useragent);
-	pref.setUnicharPref("msim.current.id", id);
+	msim_pref.setUnicharPref("general.useragent.override", useragent);
+	msim_pref.setUnicharPref("msim.current.useragent", useragent);
+	msim_pref.setUnicharPref("msim.current.id", id);
 
-	msim.updateIcon();
+	if(msim) msim.updateIcon();
 };
 
 function getSoftBankUserAgent(useragent, serial) {
-	var notifySerial = pref.getBoolPref("msim.config.SB.notifyserial");
+	var notifySerial = msim_pref.getBoolPref("msim.config.SB.notifyserial");
 	if (true == notifySerial) {
 		useragent = useragent.replace("[/Serial]", "/" + serial);
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/util.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/util.js (revision 19720)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/util.js (revision 20183)
@@ -216,5 +216,5 @@
 	for (var i in params) {
 		if(i.toUpperCase() == "UID" && params[i].toUpperCase() == "NULLGWDOCOMO"){
-			params[i] = pref.copyUnicharPref("msim.config.DC.uid");
+			params[i] = msim_pref.copyUnicharPref("msim.config.DC.uid");
 		}
 		r += '<input type="hidden" name="'+i+'" value="'+params[i]+'" />\n';
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/preferences.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/preferences.js (revision 19719)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/preferences.js (revision 20183)
@@ -18,8 +18,8 @@
  * ***** END LICENSE BLOCK ***** */
 
-var jsLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Components.interfaces.mozIJSSubScriptLoader);
-jsLoader.loadSubScript("chrome://global/content/nsUserSettings.js");
+var msim_jsLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Components.interfaces.mozIJSSubScriptLoader);
+msim_jsLoader.loadSubScript("chrome://global/content/nsUserSettings.js");
 
-var pref = {
+var msim_pref = {
 	__proto__ : nsPreferences,
 
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/dialogs/device.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/dialogs/device.js (revision 19581)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/dialogs/device.js (revision 20183)
@@ -47,9 +47,9 @@
 		dump(carrier + "\n");
 		dump(id + "\n");
-		document.getElementById("msim.options.device.device").value = pref
+		document.getElementById("msim.options.device.device").value = msim_pref
 				.copyUnicharPref("msim.devicelist." + carrier + "." + id
 						+ ".device");
 		document.getElementById("msim.options.device.carrier").value = carrierName[carrier];
-		document.getElementById("msim.options.device.useragent").value = pref
+		document.getElementById("msim.options.device.useragent").value = msim_pref
 				.copyUnicharPref("msim.devicelist." + carrier + "." + id
 						+ ".useragent");
@@ -94,7 +94,7 @@
 		t.setAttribute("size", 50);
 		if (id
-				&& pref.copyUnicharPref("msim.devicelist." + carrier + "." + id
+				&& msim_pref.copyUnicharPref("msim.devicelist." + carrier + "." + id
 						+ "." + a)) {
-			t.setAttribute("value", pref.copyUnicharPref("msim.devicelist."
+			t.setAttribute("value", msim_pref.copyUnicharPref("msim.devicelist."
 							+ carrier + "." + id + "." + a));
 		}
@@ -125,8 +125,8 @@
 			// carrier =
 			// document.getElementById("msim.options.device.carrierlist").selectedItem.getAttribute("id");
-			saveId = pref.getIntPref("msim.devicelist." + carrier + ".count")
+			saveId = msim_pref.getIntPref("msim.devicelist." + carrier + ".count")
 					+ 1;
-			pref.setIntPref("msim.devicelist." + carrier + ".count", saveId);
-			pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId
+			msim_pref.setIntPref("msim.devicelist." + carrier + ".count", saveId);
+			msim_pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId
 							+ ".carrier", carrier);
 		} else {
@@ -148,7 +148,7 @@
 			return false;
 		}
-		pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId
+		msim_pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId
 						+ ".device", deviceName);
-		pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId
+		msim_pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId
 						+ ".useragent", userAgent);
 
@@ -163,5 +163,5 @@
 			dump("getvalue:" + elementId + ":"
 					+ document.getElementById(elementId).value + "\n");
-			pref
+			msim_pref
 					.setUnicharPref("msim.devicelist." + carrier + "." + saveId
 									+ "." + a, document
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/options.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/options.js (revision 19581)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/options.js (revision 20183)
@@ -37,22 +37,22 @@
 		var prefPrefix = "msim.devicelist." + carrier + "." + deletedId + "."
 		for(var i=0; i<deviceBasicAttribute.length; i++){
-			pref.deletePref(prefPrefix+deviceBasicAttribute[i]);
+			msim_pref.deletePref(prefPrefix+deviceBasicAttribute[i]);
 		}
 		for(var i=0; i<deviceAttribute[carrier].length; i++){
-			pref.deletePref(prefPrefix+deviceAttribute[carrier][i]);
+			msim_pref.deletePref(prefPrefix+deviceAttribute[carrier][i]);
 		}
 
 		//既に使われている端末だったら設定をリセット
-		if(pref.copyUnicharPref("msim.current.id") == deletedId && pref.copyUnicharPref("msim.current.carrier") == carrier){
+		if(msim_pref.copyUnicharPref("msim.current.id") == deletedId && msim_pref.copyUnicharPref("msim.current.carrier") == carrier){
 			dump("[msim]Debug : This device is used. Reset your settings.\n");
-			pref.deletePref("msim.current.carrier");
-			pref.deletePref("msim.current.device");
-			pref.deletePref("general.useragent.override");
-			pref.deletePref("msim.current.useragent");
-			pref.deletePref("msim.current.id");
+			msim_pref.deletePref("msim.current.carrier");
+			msim_pref.deletePref("msim.current.device");
+			msim_pref.deletePref("general.useragent.override");
+			msim_pref.deletePref("msim.current.useragent");
+			msim_pref.deletePref("msim.current.id");
 		}
 
 		//各端末のidを再計算
-		var count = pref.getIntPref("msim.devicelist." + carrier + ".count");
+		var count = msim_pref.getIntPref("msim.devicelist." + carrier + ".count");
 		dump(deletedId+":"+count+"\n");
 		dump((deletedId+1)+":"+count+"\n");
@@ -62,11 +62,11 @@
 			var ePrefPrefix = "msim.devicelist." + carrier + "." + (i-1) + ".";
 			for(var j=0; j<deviceBasicAttribute.length; j++){
-				pref.setUnicharPref(ePrefPrefix+deviceBasicAttribute[j], pref.copyUnicharPref(sPrefPrefix+deviceBasicAttribute[j]));
+				msim_pref.setUnicharPref(ePrefPrefix+deviceBasicAttribute[j], msim_pref.copyUnicharPref(sPrefPrefix+deviceBasicAttribute[j]));
 			}
 			for(var j=0; j<deviceAttribute[carrier].length; j++){
-				pref.setUnicharPref(ePrefPrefix+deviceAttribute[carrier][j], pref.copyUnicharPref(sPrefPrefix+deviceAttribute[carrier][j]));
-			}
-		}
-		pref.setIntPref("msim.devicelist." + carrier + ".count", count-1);
+				msim_pref.setUnicharPref(ePrefPrefix+deviceAttribute[carrier][j], msim_pref.copyUnicharPref(sPrefPrefix+deviceAttribute[carrier][j]));
+			}
+		}
+		msim_pref.setIntPref("msim.devicelist." + carrier + ".count", count-1);
 
 		deviceBox.removeChild(selectedItem);
@@ -84,5 +84,10 @@
 		var id = selectedItem.getAttribute("id");
 		if(window.openDialog("chrome://msim/content/options/dialogs/device.xul", "msim-device-dialog", "centerscreen,chrome,modal,resizable", "edit", carrier, id, retVals)){
-			setDevice(carrier, id);
+			if(retVals.id && retVals.carrier){
+			//既に使われている端末だったら設定をリセット
+				if(msim_pref.copyUnicharPref("msim.current.id") == retVals.id && msim_pref.copyUnicharPref("msim.current.carrier") == retVals.carrier){
+					setDevice(retVals.carrier, retVals.id);
+				}			
+			}
 		}
 	}else{
@@ -111,11 +116,11 @@
 {
 	var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
-	pageDocument.getElementById("msim-textbox-docomo-uid").setAttribute("value",pref.copyUnicharPref("msim.config.DC.uid"));
-	pageDocument.getElementById("msim-textbox-docomo-ser").setAttribute("value",pref.copyUnicharPref("msim.config.DC.ser"));
-	pageDocument.getElementById("msim-textbox-docomo-icc").setAttribute("value",pref.copyUnicharPref("msim.config.DC.icc"));
-	pageDocument.getElementById("msim-textbox-docomo-guid").setAttribute("value",pref.copyUnicharPref("msim.config.DC.guid"));
-	pageDocument.getElementById("msim-textbox-au-uid").setAttribute("value",pref.copyUnicharPref("msim.config.AU.uid"));
-	pageDocument.getElementById("msim-textbox-softbank-uid").setAttribute("value",pref.copyUnicharPref("msim.config.SB.uid"));
-	pageDocument.getElementById("msim-textbox-softbank-serial").setAttribute("value",pref.copyUnicharPref("msim.config.SB.serial"));
+	pageDocument.getElementById("msim-textbox-docomo-uid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.uid"));
+	pageDocument.getElementById("msim-textbox-docomo-ser").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.ser"));
+	pageDocument.getElementById("msim-textbox-docomo-icc").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.icc"));
+	pageDocument.getElementById("msim-textbox-docomo-guid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.guid"));
+	pageDocument.getElementById("msim-textbox-au-uid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.AU.uid"));
+	pageDocument.getElementById("msim-textbox-softbank-uid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.SB.uid"));
+	pageDocument.getElementById("msim-textbox-softbank-serial").setAttribute("value",msim_pref.copyUnicharPref("msim.config.SB.serial"));
 }
 
@@ -135,8 +140,8 @@
 		var carrier = carrierArray[j];
 
-		deviceCount = pref.getIntPref("msim.devicelist." + carrier + ".count");
+		deviceCount = msim_pref.getIntPref("msim.devicelist." + carrier + ".count");
 		for(var i = 1; i <= deviceCount; i++){
-			var device = pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".device");
-			var useragent = pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".useragent");
+			var device = msim_pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".device");
+			var useragent = msim_pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".useragent");
 			if(device){
 				var listItem = deviceBox.appendItem(carrier + ":" + device, useragent);
@@ -160,15 +165,15 @@
 	// Loop through the boolean options
 	for(option in msim_optionsDataBoolean){
-		pref.setBoolPref(option, msim_optionsDataBoolean[option]);
+		msim_pref.setBoolPref(option, msim_optionsDataBoolean[option]);
 	}
 
 	// Loop through the integer options
 	for(option in msim_optionsDataInteger){
-		pref.setIntPref(option, msim_optionsDataInteger[option]);
+		msim_pref.setIntPref(option, msim_optionsDataInteger[option]);
 	}
 
 	// Loop through the string options
 	for(option in msim_optionsDataString){
-		pref.setUnicharPref(option, msim_optionsDataString[option]);
+		msim_pref.setUnicharPref(option, msim_optionsDataString[option]);
 	}
 }
@@ -190,9 +195,9 @@
 		msim_optionsDataString["msim.config.SB.uid"]    = pageDocument.getElementById("msim-textbox-softbank-uid").value;
 		msim_optionsDataString["msim.config.SB.serial"] = pageDocument.getElementById("msim-textbox-softbank-serial").value;
-		var carrier = pref.copyUnicharPref("msim.current.carrier");
+		var carrier = msim_pref.copyUnicharPref("msim.current.carrier");
 		if(carrier == SOFTBANK){
 			dump("[msim]Debug : Current Carrier is SoftBank. Replace User-Agent.\n");
-			var id = pref.copyUnicharPref("msim.current.id");
-			var useragent = pref.copyUnicharPref("msim.devicelist."+carrier+"."+id+".useragent");
+			var id = msim_pref.copyUnicharPref("msim.current.id");
+			var useragent = msim_pref.copyUnicharPref("msim.devicelist."+carrier+"."+id+".useragent");
 			var newUserAgent = getSoftBankUserAgent(useragent, msim_optionsDataString["msim.config.SB.serial"]);
 			msim_optionsDataString["general.useragent.override"] = newUserAgent;
@@ -237,6 +242,6 @@
 			var carrier = carrierArray[i];
 			dump("target carrier is "+carrier+"\n");
-			pref.deletePref("msim.devicelist." + carrier + ".count");
-			var count = pref.getIntPref("msim.devicelist." + carrier + ".count");
+			msim_pref.deletePref("msim.devicelist." + carrier + ".count");
+			var count = msim_pref.getIntPref("msim.devicelist." + carrier + ".count");
 			for(var j=1; j<=count; j++){
 				var prefPrefix = "msim.devicelist." + carrier + "." + j + ".";
@@ -244,17 +249,17 @@
 				dump("target prefix is "+prefPrefix+"\n");
 				for(var k=0; k<deviceBasicAttribute.length; k++){
-					pref.deletePref(prefPrefix+deviceBasicAttribute[k]);
+					msim_pref.deletePref(prefPrefix+deviceBasicAttribute[k]);
 				}
 				for(var k=0; k<deviceAttribute[carrier].length; k++){
-					pref.deletePref(prefPrefix+deviceAttribute[carrier][k]);
+					msim_pref.deletePref(prefPrefix+deviceAttribute[carrier][k]);
 				}
 			}
 		}
 
-		pref.deletePref("msim.current.carrier");
-		pref.deletePref("msim.current.device");
-		pref.deletePref("general.useragent.override");
-		pref.deletePref("msim.current.useragent");
-		pref.deletePref("msim.current.id");
+		msim_pref.deletePref("msim.current.carrier");
+		msim_pref.deletePref("msim.current.device");
+		msim_pref.deletePref("general.useragent.override");
+		msim_pref.deletePref("msim.current.useragent");
+		msim_pref.deletePref("msim.current.id");
 
 		//TODO:ツールバー上のiconをupdate
@@ -268,11 +273,11 @@
 function msim_initializeGps(){
 	var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
-	pageDocument.getElementById("msim-textbox-docomo-gps-areacode").setAttribute("value",pref.copyUnicharPref("msim.config.DC.gps.areacode"));
-	pageDocument.getElementById("msim-textbox-docomo-gps-areaname").setAttribute("value",pref.copyUnicharPref("msim.config.DC.gps.areaname"));
-	pageDocument.getElementById("msim-textbox-docomo-gps-lat").setAttribute("value",pref.copyUnicharPref("msim.config.DC.gps.lat"));
-	pageDocument.getElementById("msim-textbox-docomo-gps-lon").setAttribute("value",pref.copyUnicharPref("msim.config.DC.gps.lon"));
-	pageDocument.getElementById("msim-textbox-docomo-gps-alt").setAttribute("value",pref.copyUnicharPref("msim.config.DC.gps.alt"));
-	pageDocument.getElementById("msim-textbox-au-gps-lat").setAttribute("value",pref.copyUnicharPref("msim.config.AU.gps.lat"));
-	pageDocument.getElementById("msim-textbox-au-gps-lon").setAttribute("value",pref.copyUnicharPref("msim.config.AU.gps.lon"));
+	pageDocument.getElementById("msim-textbox-docomo-gps-areacode").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.areacode"));
+	pageDocument.getElementById("msim-textbox-docomo-gps-areaname").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.areaname"));
+	pageDocument.getElementById("msim-textbox-docomo-gps-lat").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.lat"));
+	pageDocument.getElementById("msim-textbox-docomo-gps-lon").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.lon"));
+	pageDocument.getElementById("msim-textbox-docomo-gps-alt").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.alt"));
+	pageDocument.getElementById("msim-textbox-au-gps-lat").setAttribute("value",msim_pref.copyUnicharPref("msim.config.AU.gps.lat"));
+	pageDocument.getElementById("msim-textbox-au-gps-lon").setAttribute("value",msim_pref.copyUnicharPref("msim.config.AU.gps.lon"));
 }
 
@@ -280,6 +285,6 @@
 	dump("[msim]initializePictogram.\n");
 	var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
-	pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked = pref.getBoolPref("msim.config.DC.pictogram.enabled");
-	pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked = pref.getBoolPref("msim.config.AU.pictogram.enabled");
-	pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked = pref.getBoolPref("msim.config.SB.pictogram.enabled");
-}
+	pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked = msim_pref.getBoolPref("msim.config.DC.pictogram.enabled");
+	pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked = msim_pref.getBoolPref("msim.config.AU.pictogram.enabled");
+	pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked = msim_pref.getBoolPref("msim.config.SB.pictogram.enabled");
+}
Index: platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/overlay.js
===================================================================
--- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/overlay.js (revision 19722)
+++ platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/overlay.js (revision 20183)
@@ -38,8 +38,8 @@
 		}
 
-		var initialized = pref.getBoolPref("msim.config.initialized");
+		var initialized = msim_pref.getBoolPref("msim.config.initialized");
 		if (!initialized) {
 			// 何か初期化処理をしたい場合はここに記載
-			// pref.setBoolPref("msim.config.initialized", true);
+			// msim_pref.setBoolPref("msim.config.initialized", true);
 		}
 		this.updateIcon();
@@ -90,12 +90,12 @@
 		for (var j = 0; j < carrierArray.length; j++) {
 			var carrier = carrierArray[j];
-			var deviceCount = pref.getIntPref("msim.devicelist." + carrier
+			var deviceCount = msim_pref.getIntPref("msim.devicelist." + carrier
 					+ ".count");
 			for (var i = 1; i <= deviceCount; i++) {
 				var menuItem = document.createElement("menuitem");
 
-				var device = pref.copyUnicharPref("msim.devicelist." + carrier
+				var device = msim_pref.copyUnicharPref("msim.devicelist." + carrier
 						+ "." + i + ".device");
-				var useragent = pref.copyUnicharPref("msim.devicelist."
+				var useragent = msim_pref.copyUnicharPref("msim.devicelist."
 						+ carrier + "." + i + ".useragent");
 
@@ -114,6 +114,6 @@
 
 		var currentMenuId = "msim-device-" + suffix + "-"
-				+ pref.copyUnicharPref("msim.current.carrier") + "-"
-				+ pref.copyUnicharPref("msim.current.id");
+				+ msim_pref.copyUnicharPref("msim.current.carrier") + "-"
+				+ msim_pref.copyUnicharPref("msim.current.id");
 		var currentMenu = document.getElementById(currentMenuId);
 		if (!currentMenu) {
@@ -149,9 +149,9 @@
 	msim_resetDevice : function(e) {
 		dump("[msim]resetDevice.\n");
-		pref.deletePref("msim.current.carrier");
-		pref.deletePref("msim.current.device");
-		pref.deletePref("general.useragent.override");
-		pref.deletePref("msim.current.useragent");
-		pref.deletePref("msim.current.id");
+		msim_pref.deletePref("msim.current.carrier");
+		msim_pref.deletePref("msim.current.device");
+		msim_pref.deletePref("general.useragent.override");
+		msim_pref.deletePref("msim.current.useragent");
+		msim_pref.deletePref("msim.current.id");
 
 		this.updateIcon();
@@ -170,5 +170,5 @@
 	msim_BrowserOnLoad : function(objEvent) {
 
-		var carrier = pref.copyUnicharPref("msim.current.carrier");
+		var carrier = msim_pref.copyUnicharPref("msim.current.carrier");
 
 		if (carrier) {
@@ -240,5 +240,5 @@
 				}
 
-				var pictogramConverterEnabled = pref.getBoolPref("msim.config."+carrier+".pictogram.enabled")
+				var pictogramConverterEnabled = msim_pref.getBoolPref("msim.config."+carrier+".pictogram.enabled")
 				if (pictogramConverterEnabled){
 					dump("[msim]convert pictogram in overlay.js\n");
@@ -269,5 +269,5 @@
 					if (true == confirm(msim.strings
 							.getString("msim_utnConfirmation"))) {
-						pref.setBoolPref("msim.temp.utnflag", true);
+						msim_pref.setBoolPref("msim.temp.utnflag", true);
 					}
 					return true;
@@ -278,5 +278,5 @@
 					if (true == confirm(msim.strings
 							.getString("msim_lcsConfirmation"))) {
-						pref.setBoolPref("msim.temp.lcsflag", true);
+						msim_pref.setBoolPref("msim.temp.lcsflag", true);
 						return true;
 					} else {
@@ -285,6 +285,6 @@
 				};
 
-				pref.setBoolPref("msim.temp.utnflag", false);
-				pref.setBoolPref("msim.temp.lcsflag", false);
+				msim_pref.setBoolPref("msim.temp.utnflag", false);
+				msim_pref.setBoolPref("msim.temp.lcsflag", false);
 
 				var anchorTags = ndDocument.getElementsByTagName('a');
@@ -344,5 +344,5 @@
 									&& value.toUpperCase() == "NULLGWDOCOMO") {
 								dump("replace uid\n");
-								var uid = pref
+								var uid = msim_pref
 										.copyUnicharPref("msim.config.DC.uid");
 								inputTag.value = uid;
@@ -382,5 +382,5 @@
 		var menu       = document.getElementById("msim-menu");
 		if (msimButton) {
-			var carrier = pref.copyUnicharPref("msim.current.carrier");
+			var carrier = msim_pref.copyUnicharPref("msim.current.carrier");
 			if (!carrier) {
 				dump("[msim]set default\n");
@@ -392,5 +392,5 @@
 		}
 		if (menu) {
-			var carrier = pref.copyUnicharPref("msim.current.carrier");
+			var carrier = msim_pref.copyUnicharPref("msim.current.carrier");
 			if (!carrier) {
 				dump("[msim]set default\n");