summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Lima Chaves <glima@profusion.mobi>2012-11-30 16:52:13 +0000
committerGustavo Lima Chaves <glima@profusion.mobi>2012-11-30 16:52:13 +0000
commit0f91fbc0174960f5d2807ff173fe687f855a8329 (patch)
tree023b343549427f201b2fb30e90e8b2e4b8d4332a
parent8817301340697b4edd21636237c7327a3cc1f038 (diff)
[elm] Bumping config file as to accomodate for
prefs module new entry. SVN revision: 79915
-rw-r--r--src/lib/elm_config.c24
-rw-r--r--src/lib/elm_priv.h2
2 files changed, 24 insertions, 2 deletions
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index bcfa16b6e..13749add6 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1317,7 +1317,7 @@ _config_update(void)
1317 { 1317 {
1318 /* weird profile or something? We should probably fill 1318 /* weird profile or something? We should probably fill
1319 * with hardcoded defaults, or get from default previx */ 1319 * with hardcoded defaults, or get from default previx */
1320 return; 1320 return;
1321 } 1321 }
1322#define IFCFG(v) if ((_elm_config->config_version & 0xffff) < (v)) { 1322#define IFCFG(v) if ((_elm_config->config_version & 0xffff) < (v)) {
1323#define IFCFGELSE } else { 1323#define IFCFGELSE } else {
@@ -1334,6 +1334,28 @@ _config_update(void)
1334 COPYVAL(longpress_timeout); 1334 COPYVAL(longpress_timeout);
1335 IFCFGEND; 1335 IFCFGEND;
1336 1336
1337 IFCFG(0x0004);
1338
1339#define PREFS_IFACE_MODULE_STR "prefs>prefs_iface"
1340
1341 const char *new = NULL;
1342 if (!_elm_config->modules)
1343 new = eina_stringshare_add(PREFS_IFACE_MODULE_STR);
1344 else
1345 {
1346 if (!strstr(_elm_config->modules, PREFS_IFACE_MODULE_STR))
1347 new = eina_stringshare_printf
1348 ("%s:%s", orig_modules, PREFS_IFACE_MODULE_STR);
1349 }
1350
1351 if (new)
1352 {
1353 eina_stringshare_del(_elm_config->modules);
1354 _elm_config->modules = new;
1355 }
1356
1357 IFCFGEND;
1358
1337#undef COPYSTR 1359#undef COPYSTR
1338#undef COPYPTR 1360#undef COPYPTR
1339#undef COPYVAL 1361#undef COPYVAL
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index db68df591..511790b37 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -113,7 +113,7 @@ struct _Elm_Theme
113 * the users config doesn't need to be wiped - simply new values need 113 * the users config doesn't need to be wiped - simply new values need
114 * to be put in 114 * to be put in
115 */ 115 */
116#define ELM_CONFIG_FILE_GENERATION 0x0003 116#define ELM_CONFIG_FILE_GENERATION 0x0004
117#define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << 16) | \ 117#define ELM_CONFIG_VERSION ((ELM_CONFIG_EPOCH << 16) | \
118 ELM_CONFIG_FILE_GENERATION) 118 ELM_CONFIG_FILE_GENERATION)
119/* NB: profile configuration files (.src) must have their 119/* NB: profile configuration files (.src) must have their