Changeset 13453 in vbox for trunk/src

Timestamp:

Oct 21, 2008 4:10:22 PM (16 years ago)

Author:

vboxsync

Message:

Main (Guest Properties): try again to fix the XML issues

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5212 +5212 @@
                 mHWData->mGuestProperties.push_back(property);
             }
-            notificationPatterns = guestPropertiesNode.stringValue ("NotificationPatterns");
+            notificationPatterns = guestPropertiesNode.stringValue ("notificationPatterns");
         }
         mHWData->mPropertyServiceActive = false;
@@ -6601 +6601 @@
             propertyNode.setValue <Bstr> ("flags", Bstr(szFlags));
         }
-        guestPropertiesNode.setValue <Bstr> ("NotificationPatterns",
-                                             mHWData->mGuestPropertyNotificationPatterns);
+        guestPropertiesNode.setValueOr <Bstr> ("notificationPatterns",
+                                               mHWData->mGuestPropertyNotificationPatterns,
+                                               Bstr (""));
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -701 +701 @@
 
 <xsd:complexType name="TGuestProperties">
+  <xsd:sequence>
+    <xsd:element name="GuestProperty" type="TGuestProperty" minOccurs="0" maxOccurs="unbounded"/>
+  </xsd:sequence>
   <xsd:attribute name="notificationPatterns" type="xsd:string" default=""/>
-  <xsd:sequence>
-    <xsd:element name="GuestProperty" type="TGuestProperty" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
 </xsd:complexType>