From 25227863e045a89e5a8aa3c626318dcae6bde895 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Sat, 29 May 2010 11:18:39 +0800
Subject: [PATCH] Do not call readDefaultValues in constructor function.

---
 src/Config.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Config.cc b/src/Config.cc
index 476b803..13bf962 100644
--- a/src/Config.cc
+++ b/src/Config.cc
@@ -70,7 +70,6 @@ Config::Config (Bus & bus, const std::string & name)
     m_init_simp_chinese = TRUE;
     m_special_phrases = TRUE;
 
-    readDefaultValues ();
     g_signal_connect (get<IBusConfig> (),
                       "value-changed",
                       G_CALLBACK (valueChangedCallback),
@@ -282,8 +281,9 @@ PinyinConfig::PinyinConfig (Bus & bus, const std::string & name)
 void
 PinyinConfig::init (Bus & bus)
 {
-    if (PinyinConfig::m_instance == NULL) {
-        PinyinConfig::m_instance.reset (new PinyinConfig (bus));
+    if (m_instance == NULL) {
+        m_instance.reset (new PinyinConfig (bus));
+        m_instance->readDefaultValues ();
     }
 }
 
@@ -404,8 +404,9 @@ BopomofoConfig::BopomofoConfig (Bus & bus)
 void
 BopomofoConfig::init (Bus & bus)
 {
-    if (BopomofoConfig::m_instance == NULL) {
-        BopomofoConfig::m_instance.reset (new BopomofoConfig (bus));
+    if (m_instance == NULL) {
+        m_instance.reset (new BopomofoConfig (bus));
+        m_instance->readDefaultValues ();
     }
 }
 
-- 
2.7.4