Changes: Hard-coded GConf key strings moved from monitorbooster.cpp to the top-level CMakeLists.txt

CMakeLists.txt

@@ -61,6 +61,11 @@ endif ($ENV{DISABLE_VERIFICATION})
 add_definitions(-DPROG_NAME_INVOKER="invoker")
 add_definitions(-DPROG_NAME_LAUNCHER="applauncherd")
 
+# Set gconf key definitions. These are used by MonitorBooster to get
+# notifications when language / theme changes.
+add_definitions(-DMEEGOTOUCH_THEME_GCONF_KEY="/meegotouch/theme/name")
+add_definitions(-DMEEGOTOUCH_LANGUAGE_GCONF_KEY="/meegotouch/i18n/language")
+
 # Build with test coverage switch if BUILD_COVERAGE environment variable is set
 if ($ENV{BUILD_COVERAGE})
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs")

src/launcher/monitorbooster.cpp

@@ -32,8 +32,12 @@ const string MonitorBooster::m_temporaryProcessName = "booster-monitor";
 
 MonitorBooster::MonitorBooster()
 {
-    addKey("/meegotouch/theme/name");
+    // Add keys to listen to.
-    addKey("/meegotouch/i18n/language");
+    addKey(MEEGOTOUCH_THEME_GCONF_KEY);
+    addKey(MEEGOTOUCH_LANGUAGE_GCONF_KEY);
+
+    // Add process names to be killed if the state of
+    // added keys changes.
     addProcessName(MBooster::temporaryProcessName().c_str());
     addProcessName(WRTBooster::temporaryProcessName().c_str());
 }