Changeset 3ddcf2d9cdfa

Timestamp:

11/16/08 21:44:29 (7 weeks ago)

Author:

Milosz Derezynski <monostatic77@…>

Branch:

trunk

Message:

* Oops: load config file first, then register keys+domains using the new scheme/system

Files:

• mcs/mcs.cpp (modified) (5 diffs)
• mpx/main.cc (modified) (3 diffs)

mcs/mcs.cpp

@@ -285 +285 @@
         if (!xpathObj)
         {
+            g_message("No xpathobj");
             goto clear_xpathobj;
         }
@@ -290 +291 @@
         if (!xpathObj->nodesetval)
         {
+            g_message("No nodes");
             goto clear_xpathobj;
         }
@@ -295 +297 @@
         if (!xpathObj->nodesetval->nodeNr)
         {
+            g_message("No nodeNr");
             goto clear_xpathobj;
         }
@@ -300 +303 @@
         if (xpathObj->nodesetval->nodeNr > 1) //XXX: There can only be ONE node!
         {
+            g_message("More than 1 key with the same name");
             goto clear_xpathobj;
         }
@@ -305 +309 @@
         if (!xpathObj->nodesetval->nodeTab[0]->children)
         {
+            g_message("Key is empty");
             goto clear_xpathobj;
         }

mpx/main.cc

@@ -130 +130 @@
     {
         try{
+
             mcs = new Mcs::Mcs (Glib::build_filename (get_app_config_dir (), "config.xml"), "mpx", 0.01);
-        } catch( Mcs::Mcs::Exceptions & cxe )
-        {
+
+        } catch( Mcs::Mcs::Exceptions & cxe ) {
+
             if (cxe == Mcs::Mcs::PARSE_ERROR)
             {
@@ -138 +140 @@
             }
         }
+
+        mcs->load (Mcs::Mcs::VERSION_IGNORE);
 
         mcs->domain_register ("main-window");
@@ -275 +279 @@
         mcs->domain_register("PlaybackSourceMusicLib");
         mcs->key_register("PlaybackSourceMusicLib", "divider-position", 250);
-
-        mcs->load (Mcs::Mcs::VERSION_IGNORE);
     }