the endless quest to plug memory leaks -- episode 379

[ardour.git] / libs / pbd / controllable.cc

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index a1144286adee6b74d7f710298d89b3720ec79495..b730a42980ffa08b05b8ec3390c22690113088c5 100644 (file)
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -23,7 +23,7 @@
 #include "pbd/error.h"
 #include "pbd/locale_guard.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace std;
@@ -107,7 +107,7 @@ XMLNode&
 Controllable::get_state ()
 {
        XMLNode* node = new XMLNode (xml_node_name);
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        char buf[64];
 
        /* Waves' "Pressure3" has a parameter called "µ-iness"
@@ -115,7 +115,11 @@ Controllable::get_state ()
         *  Bytes: 0xB5 0x2D 0x69 0x6E
         *          <Controllable name="�-iness" id="2391" flags="" value="0.000000000000" p
         */
-       //node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at
+
+       // this is not reloaded from XML, but it must be present because it is
+       // used to find and identify XML nodes by various Controllable-derived objects
+
+       node->add_property (X_("name"), _name);
 
        id().print (buf, sizeof (buf));
        node->add_property (X_("id"), buf);
@@ -134,7 +138,7 @@ Controllable::get_state ()
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        const XMLProperty* prop;
 
        Stateful::save_extra_xml (node);