Bug 920551 - 2.f/2: fix Voicemail. r=hsinyi,khuey

b2g/app/b2g.js

@@ -820,9 +820,6 @@ pref("gfx.canvas.skiagl.dynamic-cache", true);
 // Cell Broadcast API
 pref("ril.cellbroadcast.disabled", false);
 
-// Voice Mail API
-pref("dom.voicemail.enabled", true);
-
 // The url of the page used to display network error details.
 pref("b2g.neterror.url", "app://system.gaiamobile.org/net_error.html");
 

dom/webidl/moz.build

@@ -468,11 +468,6 @@ if CONFIG['MOZ_GAMEPAD']:
         'Gamepad.webidl',
     ]
 
-if CONFIG['MOZ_B2G_RIL']:
-    WEBIDL_FILES += [
-        'MozVoicemail.webidl',
-    ]
-
 WEBIDL_FILES += [
     'CloseEvent.webidl',
     'CustomEvent.webidl',
@@ -516,6 +511,7 @@ if CONFIG['MOZ_B2G_RIL']:
         'MozEmergencyCbModeEvent.webidl',
         'MozOtaStatusEvent.webidl',
         'MozStkCommandEvent.webidl',
+        'MozVoicemail.webidl',
         'MozVoicemailEvent.webidl',
         'MozWifiConnectionInfoEvent.webidl',
         'MozWifiStatusChangeEvent.webidl',

modules/libpref/src/init/all.js

@@ -4516,7 +4516,11 @@ pref("dom.mobileconnection.enabled", false);
 #endif
 
 // Voice Mail API
+#ifdef MOZ_B2G_RIL
+pref("dom.voicemail.enabled", true);
+#else
 pref("dom.voicemail.enabled", false);
+#endif
 // Numeric default service id for Voice Mail API calls with |serviceId|
 // parameter omitted.
 pref("dom.voicemail.defaultServiceId", 0);