[settings] Use mce-setting module. MER#1554

Change all mce-gconf.[ch] references to mce-setting.[ch]. No functional changes.
sailfishos · Mar 31, 2016 · 07dd89f · 07dd89f
1 parent 1dbceef
commit 07dd89f
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 71 deletions.
diff --git a/.depend b/.depend
diff --git a/Makefile b/Makefile
@@ -278,7 +278,7 @@ MCE_CORE += powerkey.c
 MCE_CORE += mce-fbdev.c
 MCE_CORE += mce-dbus.c
 MCE_CORE += mce-dsme.c
-MCE_CORE += mce-gconf.c
+MCE_CORE += mce-setting.c
 MCE_CORE += mce-hbtimer.c
 MCE_CORE += mce-wltimer.c
 MCE_CORE += mce-wakelock.c
@@ -547,6 +547,7 @@ NORMALIZE_USES_SPC =\
 	mce-modules.h\
 	mce-sensorfw.c\
 	mce-sensorfw.h\
+	mce-setting.h\
 	mce-wakelock.c\
 	mce-wakelock.h\
 	mce-worker.c\
@@ -601,8 +602,7 @@ NORMALIZE_USES_TAB =\
 	mce-conf.h\
 	mce-dbus.c\
 	mce-dbus.h\
-	mce-gconf.c\
-	mce-gconf.h\
+	mce-setting.c\
 	mce-hal.c\
 	mce-hal.h\
 	mce-io.c\

diff --git a/event-input.c b/event-input.c
@@ -29,7 +29,7 @@
 #include "mce-lib.h"
 #include "mce-conf.h"
 #ifdef ENABLE_DOUBLETAP_EMULATION
-# include "mce-gconf.h"
+# include "mce-setting.h"
 #endif
 #include "mce-sensorfw.h"
 #include "multitouch.h"

diff --git a/mce-setting.c b/mce-setting.c
@@ -1,10 +1,12 @@
 /**
- * @file mce-gconf.c
- * Gconf handling code for the Mode Control Entity
+ * @file mce-setting.c
+ * Runtime setting handling code for the Mode Control Entity
  * <p>
  * Copyright © 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright © 2012-2016 Jolla Ltd.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
+ * @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
  *
  * mce is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License
@@ -19,7 +21,7 @@
  * License along with mce.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mce-gconf.h"
+#include "mce-setting.h"
 
 #include "mce-log.h"
 

diff --git a/mce-setting.h b/mce-setting.h
@@ -1,10 +1,12 @@
 /**
- * @file mce-gconf.h
- * Headers for the GConf handling code for the Mode Control Entity
+ * @file mce-setting.h
+ * Headers for the runtime setting handling code for the Mode Control Entity
  * <p>
  * Copyright © 2004-2007 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright © 2014-2016 Jolla Ltd.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
+ * @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
  *
  * mce is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License
@@ -18,10 +20,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with mce.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef _MCE_GCONF_H_
-#define _MCE_GCONF_H_
+#ifndef MCE_SETTING_H_
+# define MCE_SETTING_H_
 
-#include "builtin-gconf.h"
+# include "builtin-gconf.h"
 
 gboolean      mce_setting_has_key           (const gchar *const key);
 gboolean      mce_setting_set_int           (const gchar *const key, const gint value);
@@ -40,4 +42,4 @@ void          mce_setting_track_string      (const gchar *key, gchar **val, cons
 gboolean      mce_setting_init              (void);
 void          mce_setting_exit              (void);
 
-#endif /* _MCE_GCONF_H_ */
+#endif /* MCE_SETTING_H_ */
diff --git a/mce.c b/mce.c
@@ -25,7 +25,7 @@
 #include "mce-fbdev.h"
 #include "mce-hbtimer.h"
 #include "mce-wltimer.h"
-#include "mce-gconf.h"
+#include "mce-setting.h"
 #include "mce-dbus.h"
 #include "mce-dsme.h"
 #include "mce-modules.h"

diff --git a/modules/display.c b/modules/display.c
@@ -28,7 +28,7 @@
 #include "../mce-lib.h"
 #include "../mce-fbdev.h"
 #include "../mce-conf.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 #include "../mce-dbus.h"
 #include "../mce-sensorfw.h"
 #include "../tklock.h"

diff --git a/modules/doubletap.c b/modules/doubletap.c
@@ -10,7 +10,7 @@
 #include "../mce-log.h"
 #include "../mce-io.h"
 #include "../mce-conf.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 
 #include <stdbool.h>
 #include <unistd.h>

diff --git a/modules/filter-brightness-als.c b/modules/filter-brightness-als.c
@@ -31,7 +31,7 @@
 #include "../mce-log.h"
 #include "../mce-io.h"
 #include "../mce-conf.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 #include "../mce-dbus.h"
 #include "../mce-sensorfw.h"
 #include "../mce-wakelock.h"

diff --git a/modules/led.c b/modules/led.c
@@ -27,7 +27,7 @@
 #include "../mce-lib.h"
 #include "../mce-hal.h"
 #include "../mce-conf.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 #include "../mce-dbus.h"
 #include "../mce-hbtimer.h"
 

diff --git a/modules/memnotify.c b/modules/memnotify.c
@@ -24,7 +24,7 @@
 #include "../mce.h"
 #include "../mce-log.h"
 #include "../mce-dbus.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 
 #include <mce/dbus-names.h>
 

diff --git a/modules/powersavemode.c b/modules/powersavemode.c
@@ -24,7 +24,7 @@
 
 #include "../mce.h"
 #include "../mce-log.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 #include "../mce-dbus.h"
 
 #include <mce/dbus-names.h>

diff --git a/modules/proximity.c b/modules/proximity.c
@@ -24,7 +24,7 @@
 
 #include "../mce.h"
 #include "../mce-log.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 #include "../mce-sensorfw.h"
 
 #include <gmodule.h>

diff --git a/modules/sensor-gestures.c b/modules/sensor-gestures.c
@@ -22,7 +22,7 @@
 
 #include "../mce.h"
 #include "../mce-log.h"
-#include "../mce-gconf.h"
+#include "../mce-setting.h"
 #include "../mce-dbus.h"
 #include "../mce-sensorfw.h"
 #include "display.h"

diff --git a/powerkey.c b/powerkey.c
@@ -29,7 +29,7 @@
 #include "mce-log.h"
 #include "mce-lib.h"
 #include "mce-conf.h"
-#include "mce-gconf.h"
+#include "mce-setting.h"
 #include "mce-dbus.h"
 #include "mce-dsme.h"
 

diff --git a/tests/ut/ut_display.c b/tests/ut/ut_display.c
@@ -175,7 +175,7 @@ static void stub_mce_conf_teardown_unchecked(void)
 }
 
 /*
- * mce-gconf.c stubs {{{1
+ * mce-setting.c stubs {{{1
  */
 
 typedef struct stub__mce_setting_notifier_data

diff --git a/tklock.c b/tklock.c
@@ -28,7 +28,7 @@
 #include "mce-lib.h"
 #include "mce-io.h"
 #include "mce-conf.h"
-#include "mce-gconf.h"
+#include "mce-setting.h"
 #include "mce-dbus.h"
 #include "mce-hbtimer.h"
 #include "evdev.h"