Changeset 51fd645cf759

Timestamp:

11/16/08 22:04:11 (7 weeks ago)

Author:

Milosz Derezynski <monostatic77@…>

Branch:

trunk

Message:

* Fix a few more problems with correct type of key registration

Files:

• mcs/mcs.cpp (modified) (2 diffs)

mcs/mcs.cpp

@@ -262 +262 @@
         g_return_if_fail( domains.find(domain) != domains.end() );
 
-        KeyType             type          = KeyType(key_default.which());
-        KeyVariant          variant       = key_default;
+        domains.find( domain )->second[key] = Key( domain, key, key_default, KeyType(key_default.which()) );
 
         if( !m_doc )
         {
-            domains.find( domain )->second[key] = Key( domain, key, variant, type );
             return;
         }
 
+        Key               & key_instance = domains.find( domain )->second[key];
+        KeyType             type         = key_instance.get_type(); 
+        KeyVariant          variant;
         std::stringstream   xpath;
         xmlXPathObjectPtr   xpathObj;
@@ -336 +337 @@
         }
 
-        domains.find( domain )->second[key] = Key( domain, key, variant, type );
+        key_instance.set_value_silent( variant );
 
         clear_xpathobj: