Backed out changeset 170e22ea9aa0 (bug 814634) for missing r= in comment

dom/voicemail/nsIDOMMozVoicemailStatus.idl

@@ -6,10 +6,13 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(efd352af-9eee-48dc-8e92-4d4fdbc89ecb)]
+[scriptable, uuid(8c58859a-e006-466a-ad76-b188ba0918ab)]
 interface nsIDOMMozVoicemailStatus : nsISupports
 {
-  readonly attribute unsigned long serviceId;
+  /**
+   * There are voicemail messages waiting, but the count is unknown.
+   */
+  const long MESSAGE_COUNT_UNKNOWN = -1;
 
   /**
    * Whether or not there are messages waiting in the voicemail box
@@ -19,7 +22,7 @@ interface nsIDOMMozVoicemailStatus : nsISupports
   /**
    * The total message count. Some voicemail indicators will only specify that
    * messages are waiting, but not the actual number. In that case, the value
-   * of messageCount will be -1, indicating the unknown message count.
+   * of messageCount will be MESSAGE_COUNT_UNKNOWN (-1).
    *
    * Logic for a voicemail notification might look something like:
    * if (status.hasMessages) {

dom/webidl/MozVoicemail.webidl

@@ -11,28 +11,26 @@ interface MozVoicemailStatus;
 interface MozVoicemail : EventTarget
 {
   /**
-   * The current voicemail status of a specified service, or null when the
-   * status is unknown.
+   * The current voicemail status, or null when the status is unknown
    */
-  [Throws]
-  MozVoicemailStatus getStatus(optional unsigned long serviceId);
+  [GetterThrows]
+  readonly attribute MozVoicemailStatus? status;
 
   /**
-   * The voicemail box dialing number of a specified service, or null if one
-   * wasn't found.
+   * The voicemail box dialing number, or null if one wasn't found
    */
-  [Throws]
-  DOMString getNumber(optional unsigned long serviceId);
+  [GetterThrows]
+  readonly attribute DOMString? number;
 
   /**
-   * The display name of the voicemail box dialing number of a specified service,
-   * or null if one wasn't found.
+   * The display name of the voicemail box dialing number, or null if one
+   * wasn't found
    */
-  [Throws]
-  DOMString getDisplayName(optional unsigned long serviceId);
+  [GetterThrows]
+  readonly attribute DOMString? displayName;
 
   /**
-   * The current voicemail status has changed.
+   * The current voicemail status has changed
    */
   attribute EventHandler onstatuschanged;
 };