Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[mms-settings] Changed dconf path for MMS settings
Previously, MMS settings were stored right in the IMSI directory at the
root of the dconf namespace. They have been moved to /imsi/ folder and
MMS settings now live in the mms subfolder, i.e. /IMSI/ -> /imsi/IMSI/mms/

Old settings are migrated to the new location the first time they are
requested. Instead of GSettings we now directly use DConf because it
appears to be impossible to properly implement migration with GSettings.
That makes gschema obsolete but we need to keep it around for backward
compatibility reasons.
  • Loading branch information
monich committed Jul 14, 2014
1 parent 60517c3 commit b9de1d2
Show file tree
Hide file tree
Showing 7 changed files with 217 additions and 110 deletions.
2 changes: 1 addition & 1 deletion mms-engine/Makefile
Expand Up @@ -17,7 +17,7 @@ include ../mms-lib/Config.mak
#

PKGS = gio-unix-2.0 gio-2.0
LIB_PKGS = libwspcodec libsoup-2.4 $(RESIZE_PKG) $(PKGS)
LIB_PKGS = libwspcodec libsoup-2.4 dconf $(RESIZE_PKG) $(PKGS)

#
# Default target
Expand Down
2 changes: 1 addition & 1 deletion mms-engine/mms-engine.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
CONFIG += link_pkgconfig
PKGCONFIG += gio-unix-2.0 gio-2.0 glib-2.0 libsoup-2.4 libwspcodec ImageMagick
PKGCONFIG += gio-unix-2.0 gio-2.0 glib-2.0 libsoup-2.4 dconf libwspcodec ImageMagick
DBUS_INTERFACE_DIR = $$_PRO_FILE_PWD_
MMS_LIB_DIR = $$_PRO_FILE_PWD_/../mms-lib
MMS_OFONO_DIR = $$_PRO_FILE_PWD_/../mms-ofono
Expand Down
2 changes: 1 addition & 1 deletion mms-settings-dconf/Makefile
Expand Up @@ -3,7 +3,7 @@
.PHONY: clean all debug release

# Required packages
PKGS = gio-2.0
PKGS = dconf

#
# Default target
Expand Down
2 changes: 1 addition & 1 deletion mms-settings-dconf/mms-settings-dconf.pro
Expand Up @@ -2,7 +2,7 @@ TEMPLATE = lib
CONFIG += staticlib
CONFIG -= qt
CONFIG += link_pkgconfig
PKGCONFIG += glib-2.0 gio-2.0 gio-unix-2.0
PKGCONFIG += glib-2.0 dconf
INCLUDEPATH += include
INCLUDEPATH += ../mms-lib/include
QMAKE_CFLAGS += -Wno-unused
Expand Down
2 changes: 1 addition & 1 deletion mms-settings-dconf/spec/org.nemomobile.mms.sim.gschema.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<!--
Path is /IMSI/
Path is /imsi/IMSI/mms/
These defaults should match those defined in mms_settings.h
-->
<schema id="org.nemomobile.mms.sim">
Expand Down

0 comments on commit b9de1d2

Please sign in to comment.