summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 23:57:05 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 23:57:05 +0000
commit0f01a6b279a69c376ccb677019bcb2b29d9b4ebb (patch)
tree3378f91eaf199da44503d07a2551f5f2b9e2e226
parent66a749c2ce2087367d293e099d0a805cdc0703cf (diff)
in a move which will make me tremendously unpopular, config versioning has been changed from hex to dec across the whole tree, including helper functions and modules
PS. HAHAHAHAHAHAHAHA SVN revision: 81624
-rw-r--r--config/default/e.src2
-rw-r--r--config/mobile/e.src2
-rw-r--r--config/mobile/module.conf.src2
-rw-r--r--config/standard/e.src4
-rw-r--r--config/standard/module.conf.src4
-rw-r--r--config/standard/module.fileman.src11
-rw-r--r--src/bin/e_config.c275
-rw-r--r--src/bin/e_config.h6
-rw-r--r--src/bin/e_utils.c10
-rw-r--r--src/modules/conf/e_mod_main.c13
-rw-r--r--src/modules/conf/e_mod_main.h9
-rw-r--r--src/modules/everything/e_mod_main.c113
-rw-r--r--src/modules/everything/e_mod_main.h9
-rw-r--r--src/modules/everything/evry_plug_apps.c22
-rw-r--r--src/modules/everything/evry_plug_files.c29
-rw-r--r--src/modules/fileman/e_mod_main.c85
-rw-r--r--src/modules/fileman/e_mod_main.h6
-rw-r--r--src/modules/mixer/e_mod_main.c14
-rw-r--r--src/modules/mixer/e_mod_main.h9
-rw-r--r--src/modules/notification/e_mod_main.c4
-rw-r--r--src/modules/notification/e_mod_main.h9
-rw-r--r--src/modules/physics/e_mod_physics_cfdata.h6
-rw-r--r--src/modules/quickaccess/e_mod_main.h6
23 files changed, 157 insertions, 493 deletions
diff --git a/config/default/e.src b/config/default/e.src
index c9a893e0d..64b702b75 100644
--- a/config/default/e.src
+++ b/config/default/e.src
@@ -1,5 +1,5 @@
1group "E_Config" struct { 1group "E_Config" struct {
2 value "config_version" int: 65865; 2 value "config_version" int: 1000000;
3 value "show_splash" int: 0; 3 value "show_splash" int: 0;
4 value "init_default_theme" string: "default.edj"; 4 value "init_default_theme" string: "default.edj";
5 value "desktop_default_name" string: "%i-%i"; 5 value "desktop_default_name" string: "%i-%i";
diff --git a/config/mobile/e.src b/config/mobile/e.src
index 3f6dc6fc1..70d2767f0 100644
--- a/config/mobile/e.src
+++ b/config/mobile/e.src
@@ -1,5 +1,5 @@
1group "E_Config" struct { 1group "E_Config" struct {
2 value "config_version" int: 65865; 2 value "config_version" int: 1000000;
3 value "show_splash" int: 1; 3 value "show_splash" int: 1;
4 value "init_default_theme" string: "default.edj"; 4 value "init_default_theme" string: "default.edj";
5 value "desktop_default_name" string: "%i-%i"; 5 value "desktop_default_name" string: "%i-%i";
diff --git a/config/mobile/module.conf.src b/config/mobile/module.conf.src
index 336b9e6fc..b0c2bea66 100644
--- a/config/mobile/module.conf.src
+++ b/config/mobile/module.conf.src
@@ -1,4 +1,4 @@
1group "Config" struct { 1group "Config" struct {
2 value "version" int: 65677; 2 value "config_version" int: 1000000;
3 value "menu_augmentation" int: 0; 3 value "menu_augmentation" int: 0;
4} 4}
diff --git a/config/standard/e.src b/config/standard/e.src
index fedb4b0e7..3e384ea24 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -1,5 +1,5 @@
1group "E_Config" struct { 1group "E_Config" struct {
2 value "config_version" int: 65865; 2 value "config_version" int: 1000000;
3 value "show_splash" int: 1; 3 value "show_splash" int: 1;
4 value "init_default_theme" string: "default.edj"; 4 value "init_default_theme" string: "default.edj";
5 value "desktop_default_name" string: "%i-%i"; 5 value "desktop_default_name" string: "%i-%i";
@@ -214,7 +214,7 @@ group "E_Config" struct {
214 value "powersave.extreme" double: 1200.0; 214 value "powersave.extreme" double: 1200.0;
215 value "powersave.min" int: 0; 215 value "powersave.min" int: 0;
216 value "powersave.max" int: 5; 216 value "powersave.max" int: 5;
217 value "no_module_delay" int: 1; 217 value "no_module_delay" int: 0;
218 group "syscon.actions" list { 218 group "syscon.actions" list {
219 group "E_Config_Syscon_Action" struct { 219 group "E_Config_Syscon_Action" struct {
220 value "action" string: "halt"; 220 value "action" string: "halt";
diff --git a/config/standard/module.conf.src b/config/standard/module.conf.src
index 336b9e6fc..f70b80a73 100644
--- a/config/standard/module.conf.src
+++ b/config/standard/module.conf.src
@@ -1,4 +1,4 @@
1group "Config" struct { 1group "Config" struct {
2 value "version" int: 65677; 2 value "config_version" int: 1000000;
3 value "menu_augmentation" int: 0; 3 value "menu_augmentation" int: 1;
4} 4}
diff --git a/config/standard/module.fileman.src b/config/standard/module.fileman.src
index b52a1fb11..a8df2f6dd 100644
--- a/config/standard/module.fileman.src
+++ b/config/standard/module.fileman.src
@@ -1,7 +1,7 @@
1group "Fileman_Config" struct { 1group "Fileman_Config" struct {
2 value "config_version" int: 65793; 2 value "config_version" int: 1000000;
3 value "view.mode" int: 1; 3 value "view.mode" int: 1;
4 value "view.open_dirs_in_place" uchar: 0; 4 value "view.open_dirs_in_place" uchar: 1;
5 value "view.selector" uchar: 0; 5 value "view.selector" uchar: 0;
6 value "view.single_click" uchar: 0; 6 value "view.single_click" uchar: 0;
7 value "view.no_subdir_jump" uchar: 0; 7 value "view.no_subdir_jump" uchar: 0;
@@ -12,6 +12,7 @@ group "Fileman_Config" struct {
12 value "view.show_full_path" uchar: 0; 12 value "view.show_full_path" uchar: 0;
13 value "view.show_desktop_icons" uchar: 1; 13 value "view.show_desktop_icons" uchar: 1;
14 value "view.show_toolbar" uchar: 0; 14 value "view.show_toolbar" uchar: 0;
15 value "view.show_sidebar" uchar: 0;
15 value "icon.icon.w" int: 48; 16 value "icon.icon.w" int: 48;
16 value "icon.icon.h" int: 48; 17 value "icon.icon.h" int: 48;
17 value "icon.list.w" int: 16; 18 value "icon.list.w" int: 16;
@@ -25,4 +26,10 @@ group "Fileman_Config" struct {
25 value "selection.single" uchar: 0; 26 value "selection.single" uchar: 0;
26 value "selection.windows_modifiers" uchar: 0; 27 value "selection.windows_modifiers" uchar: 0;
27 value "theme.fixed" uchar: 0; 28 value "theme.fixed" uchar: 0;
29 value "tooltip.enable" uchar: 1;
30 value "tooltip.delay" double: 1.0;
31 value "tooltip.size" double: 30.0;
32 value "view.spring_delay" int: 1;
33 value "icon.max_thumb_size" uint: 0;
34 value "view.toolbar_orient" uint: 5;
28} 35}
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index c2f9f9fdb..4d670a48d 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -19,7 +19,6 @@ static void _e_config_save_cb(void *data);
19static void _e_config_free(E_Config *cfg); 19static void _e_config_free(E_Config *cfg);
20static Eina_Bool _e_config_cb_timer(void *data); 20static Eina_Bool _e_config_cb_timer(void *data);
21static int _e_config_eet_close_handle(Eet_File *ef, char *file); 21static int _e_config_eet_close_handle(Eet_File *ef, char *file);
22static void _e_config_acpi_bindings_add(void);
23 22
24/* local subsystem globals */ 23/* local subsystem globals */
25static int _e_config_save_block = 0; 24static int _e_config_save_block = 0;
@@ -1005,14 +1004,13 @@ EAPI void
1005e_config_load(void) 1004e_config_load(void)
1006{ 1005{
1007 E_Config *tcfg = NULL; 1006 E_Config *tcfg = NULL;
1007 int reload = 0;
1008 1008
1009 e_config = e_config_domain_load("e", _e_config_edd); 1009 e_config = e_config_domain_load("e", _e_config_edd);
1010 if (e_config) 1010 if (e_config)
1011 { 1011 {
1012 int reload = 0;
1013
1014 /* major version change - that means wipe and restart */ 1012 /* major version change - that means wipe and restart */
1015 if ((e_config->config_version >> 16) < E_CONFIG_FILE_EPOCH) 1013 if ((e_config->config_version) < E_CONFIG_FILE_EPOCH * 1000000)
1016 { 1014 {
1017 /* your config is too old - need new defaults */ 1015 /* your config is too old - need new defaults */
1018 _e_config_free(e_config); 1016 _e_config_free(e_config);
@@ -1043,51 +1041,19 @@ e_config_load(void)
1043 "as a precaution your settings have been now restored to<br>" 1041 "as a precaution your settings have been now restored to<br>"
1044 "defaults. Sorry for the inconvenience.<br>")); 1042 "defaults. Sorry for the inconvenience.<br>"));
1045 } 1043 }
1046 /* oldest minor version supported */
1047 else if ((e_config->config_version & 0xffff) < 0x0124)
1048 {
1049 /* your config is so old - we don't even bother supporting an
1050 * upgrade path - brand new config for you! */
1051 _e_config_free(e_config);
1052 e_config = NULL;
1053 reload = 1;
1054 ecore_timer_add(1.0, _e_config_cb_timer,
1055 _("Settings data needed upgrading. Your old settings have<br>"
1056 "been wiped and a new set of defaults initialized. This<br>"
1057 "will happen regularly during development, so don't report a<br>"
1058 "bug. This simply means Enlightenment needs new settings<br>"
1059 "data by default for usable functionality that your old<br>"
1060 "settings simply lack. This new set of defaults will fix<br>"
1061 "that by adding it in. You can re-configure things now to your<br>"
1062 "liking. Sorry for the hiccup in your settings.<br>"));
1063 }
1064 if (reload) 1044 if (reload)
1065 { 1045 {
1066 e_config_profile_del(e_config_profile_get()); 1046 e_config_profile_del(e_config_profile_get());
1047 e_config_profile_set("default");
1067 e_config = e_config_domain_load("e", _e_config_edd); 1048 e_config = e_config_domain_load("e", _e_config_edd);
1068 } 1049 }
1069 } 1050 }
1070 if (!e_config) 1051 if (!e_config)
1071 { 1052 {
1072 E_Action *a;
1073
1074 e_config_profile_set("default"); 1053 e_config_profile_set("default");
1075 e_config_profile_del(e_config_profile_get()); 1054 if (!reload) e_config_profile_del(e_config_profile_get());
1076 e_config_save_block_set(1); 1055 e_config_save_block_set(1);
1077 a = e_action_find("restart"); 1056 e_sys_action_do(E_SYS_RESTART, NULL);
1078 if ((a) && (a->func.go)) a->func.go(NULL, NULL);
1079 else
1080 {
1081 ERR("EEEK! no config of any sort! abort abort abort!");
1082 e_error_message_show("Enlightenment was started without any configuration\n"
1083 "files available for the given profile (normally\n"
1084 "default or the last profile used or provided on the\n"
1085 "command-line with -profile etc.)\n\n"
1086 "Cannot contiue without configuration to work with.\n"
1087 "Please ensure you have system or user configuration\n"
1088 "for the profile you are using before proceeeding.");
1089 abort();
1090 }
1091 } 1057 }
1092 if (e_config->config_version < E_CONFIG_FILE_VERSION) 1058 if (e_config->config_version < E_CONFIG_FILE_VERSION)
1093 { 1059 {
@@ -1108,192 +1074,14 @@ e_config_load(void)
1108 * a wipe */ 1074 * a wipe */
1109 if (!tcfg) 1075 if (!tcfg)
1110 { 1076 {
1111 E_Action *a;
1112
1113 e_config_profile_set("default"); 1077 e_config_profile_set("default");
1114 e_config_profile_del(e_config_profile_get()); 1078 e_config_profile_del(e_config_profile_get());
1115 e_config_save_block_set(1); 1079 e_config_save_block_set(1);
1116 a = e_action_find("restart"); 1080 e_sys_action_do(E_SYS_RESTART, NULL);
1117 if ((a) && (a->func.go)) a->func.go(NULL, NULL);
1118 } 1081 }
1119 } 1082 }
1120#define IFCFG(v) if ((e_config->config_version & 0xffff) < (v)) { 1083
1121#define IFCFGELSE } else { 1084 e_config->config_version = E_CONFIG_FILE_VERSION;
1122#define IFCFGEND }
1123#define COPYVAL(x) do {e_config->x = tcfg->x; } while (0)
1124#define COPYPTR(x) do {e_config->x = tcfg->x; tcfg->x = NULL; } while (0)
1125#define COPYSTR(x) COPYPTR(x)
1126 if (tcfg)
1127 {
1128 /* some sort of upgrade is needed */
1129 IFCFG(0x0124);
1130 COPYVAL(thumbscroll_enable);
1131 COPYVAL(thumbscroll_threshhold);
1132 COPYVAL(thumbscroll_momentum_threshhold);
1133 COPYVAL(thumbscroll_friction);
1134 IFCFGEND;
1135
1136 IFCFG(0x0125);
1137 COPYVAL(mouse_hand);
1138 IFCFGEND;
1139
1140 IFCFG(0x0126);
1141 COPYVAL(border_keyboard.timeout);
1142 COPYVAL(border_keyboard.move.dx);
1143 COPYVAL(border_keyboard.move.dy);
1144 COPYVAL(border_keyboard.resize.dx);
1145 COPYVAL(border_keyboard.resize.dy);
1146 IFCFGEND;
1147
1148 IFCFG(0x0127);
1149 COPYVAL(scale.min);
1150 COPYVAL(scale.max);
1151 COPYVAL(scale.factor);
1152 COPYVAL(scale.base_dpi);
1153 COPYVAL(scale.use_dpi);
1154 COPYVAL(scale.use_custom);
1155 IFCFGEND;
1156
1157 IFCFG(0x0128);
1158 COPYVAL(show_cursor);
1159 COPYVAL(idle_cursor);
1160 IFCFGEND;
1161
1162 IFCFG(0x0129);
1163 COPYSTR(default_system_menu);
1164 IFCFGEND;
1165
1166 IFCFG(0x012a);
1167 COPYVAL(desklock_start_locked);
1168 IFCFGEND;
1169
1170 IFCFG(0x012b);
1171 COPYVAL(cfgdlg_normal_wins);
1172 IFCFGEND;
1173
1174 IFCFG(0x012c);
1175 COPYVAL(syscon.main.icon_size);
1176 COPYVAL(syscon.secondary.icon_size);
1177 COPYVAL(syscon.extra.icon_size);
1178 COPYVAL(syscon.timeout);
1179 COPYVAL(syscon.do_input);
1180 COPYPTR(syscon.actions);
1181 IFCFGEND;
1182
1183 IFCFG(0x012d);
1184 COPYVAL(priority);
1185 IFCFGEND;
1186
1187 IFCFG(0x012e);
1188 COPYVAL(fullscreen_flip);
1189 IFCFGEND;
1190
1191 IFCFG(0x012f);
1192 COPYVAL(icon_theme_overrides);
1193 IFCFGEND;
1194
1195 IFCFG(0x0130);
1196 COPYVAL(mode.presentation);
1197 COPYVAL(mode.offline);
1198 IFCFGEND;
1199
1200 IFCFG(0x0131);
1201 COPYVAL(desklock_post_screensaver_time);
1202 IFCFGEND;
1203
1204 IFCFG(0x0132);
1205 COPYVAL(desklock_ask_presentation);
1206 COPYVAL(desklock_ask_presentation_timeout);
1207 COPYVAL(screensaver_ask_presentation);
1208 COPYVAL(screensaver_ask_presentation_timeout);
1209 IFCFGEND;
1210
1211 IFCFG(0x0134);
1212 COPYVAL(exec.expire_timeout);
1213 COPYVAL(exec.show_run_dialog);
1214 COPYVAL(exec.show_exit_dialog);
1215 IFCFGEND;
1216 IFCFG(0x0136);
1217 _e_config_acpi_bindings_add();
1218 IFCFGEND;
1219
1220 IFCFG(0x0137);
1221 COPYVAL(desklock_on_suspend);
1222 IFCFGEND;
1223
1224 IFCFG(0x0138);
1225 COPYVAL(geometry_auto_resize_limit);
1226 COPYVAL(geometry_auto_move);
1227 IFCFGEND;
1228
1229 IFCFG(0x0142);
1230 COPYVAL(backlight.normal);
1231 COPYVAL(backlight.dim);
1232 COPYVAL(backlight.transition);
1233 COPYVAL(backlight.idle_dim);
1234 COPYVAL(backlight.timer);
1235 IFCFGEND;
1236
1237 IFCFG(0x0145);
1238 COPYVAL(xsettings.enabled);
1239 COPYVAL(xsettings.match_e17_theme);
1240 COPYVAL(xsettings.match_e17_icon_theme);
1241 IFCFGEND;
1242
1243 IFCFG(0x0147);
1244 COPYVAL(update.check);
1245 COPYVAL(update.later);
1246 IFCFGEND;
1247
1248 IFCFG(0x0149);
1249 COPYVAL(powersave.none);
1250 COPYVAL(powersave.low);
1251 COPYVAL(powersave.medium);
1252 COPYVAL(powersave.high);
1253 COPYVAL(powersave.extreme);
1254 COPYVAL(powersave.min);
1255 COPYVAL(powersave.max);
1256 IFCFGEND;
1257
1258 IFCFG(0x0150);
1259 COPYVAL(multiscreen_flip);
1260 IFCFGEND;
1261
1262 IFCFG(0x0151);
1263 if (tcfg->desklock_background)
1264 {
1265 E_Config_Desklock_Background *cbg;
1266 cbg = E_NEW(E_Config_Desklock_Background, 1);
1267 cbg->file = tcfg->desklock_background;
1268 e_config->desklock_backgrounds = eina_list_append(e_config->desklock_backgrounds, cbg);
1269 }
1270 if (e_config->desklock_backgrounds && (!e_config->desklock_backgrounds->data))
1271 e_config->desklock_backgrounds = eina_list_free(e_config->desklock_backgrounds);
1272 tcfg->desklock_background = NULL;
1273 IFCFGEND;
1274
1275 IFCFG(0x0152);
1276 COPYVAL(window_grouping);
1277 IFCFGEND;
1278
1279 IFCFG(0x0157);
1280 e_config->xkb.selected_layout = NULL;
1281 e_config->xkb.cur_layout = NULL;
1282 e_config->xkb.desklock_layout = NULL;
1283 IFCFGEND;
1284
1285 IFCFG(0x0160);
1286 e_config->window_activehint_policy = 2;
1287 IFCFGEND;
1288
1289 IFCFG(0x0162);
1290 COPYSTR(desktop_default_window_profile);
1291 COPYVAL(use_desktop_window_profile);
1292 IFCFGEND;
1293
1294 e_config->config_version = E_CONFIG_FILE_VERSION;
1295 _e_config_free(tcfg);
1296 }
1297 1085
1298 /* limit values so they are sane */ 1086 /* limit values so they are sane */
1299 E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0); 1087 E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
@@ -2376,50 +2164,3 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
2376 } 2164 }
2377 return 1; 2165 return 1;
2378} 2166}
2379
2380static void
2381_e_config_acpi_bindings_add(void)
2382{
2383 E_Config_Binding_Acpi *binding;
2384
2385 binding = E_NEW(E_Config_Binding_Acpi, 1);
2386 binding->context = E_BINDING_CONTEXT_NONE;
2387 binding->type = E_ACPI_TYPE_AC_ADAPTER;
2388 binding->status = 0;
2389 binding->action = eina_stringshare_add("dim_screen");
2390 binding->params = NULL;
2391 e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding);
2392
2393 binding = E_NEW(E_Config_Binding_Acpi, 1);
2394 binding->context = E_BINDING_CONTEXT_NONE;
2395 binding->type = E_ACPI_TYPE_AC_ADAPTER;
2396 binding->status = 1;
2397 binding->action = eina_stringshare_add("undim_screen");
2398 binding->params = NULL;
2399 e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding);
2400
2401 binding = E_NEW(E_Config_Binding_Acpi, 1);
2402 binding->context = E_BINDING_CONTEXT_NONE;
2403 binding->type = E_ACPI_TYPE_LID;
2404 binding->status = 0;
2405 binding->action = eina_stringshare_add("suspend");
2406 binding->params = eina_stringshare_add("now");
2407 e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding);
2408
2409 binding = E_NEW(E_Config_Binding_Acpi, 1);
2410 binding->context = E_BINDING_CONTEXT_NONE;
2411 binding->type = E_ACPI_TYPE_POWER;
2412 binding->status = -1;
2413 binding->action = eina_stringshare_add("halt_now");
2414 binding->params = eina_stringshare_add("now");
2415 e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding);
2416
2417 binding = E_NEW(E_Config_Binding_Acpi, 1);
2418 binding->context = E_BINDING_CONTEXT_NONE;
2419 binding->type = E_ACPI_TYPE_SLEEP;
2420 binding->status = -1;
2421 binding->action = eina_stringshare_add("suspend");
2422 binding->params = eina_stringshare_add("now");
2423 e_config->acpi_bindings = eina_list_append(e_config->acpi_bindings, binding);
2424}
2425
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 46c1c0490..9dcebdc7b 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -34,12 +34,12 @@ typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme;
34/* increment this whenever we change config enough that you need new 34/* increment this whenever we change config enough that you need new
35 * defaults for e to work. 35 * defaults for e to work.
36 */ 36 */
37#define E_CONFIG_FILE_EPOCH 0x0001 37#define E_CONFIG_FILE_EPOCH 1
38/* increment this whenever a new set of config values are added but the users 38/* increment this whenever a new set of config values are added but the users
39 * config doesn't need to be wiped - simply new values need to be put in 39 * config doesn't need to be wiped - simply new values need to be put in
40 */ 40 */
41#define E_CONFIG_FILE_GENERATION 0x0162 41#define E_CONFIG_FILE_GENERATION 0
42#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION) 42#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
43 43
44struct _E_Config 44struct _E_Config
45{ 45{
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index b7e59ae7e..4c2d2d087 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1212,14 +1212,16 @@ _e_util_conf_timer_new(void *data)
1212EAPI Eina_Bool 1212EAPI Eina_Bool
1213e_util_module_config_check(const char *module_name, int loaded, int current) 1213e_util_module_config_check(const char *module_name, int loaded, int current)
1214{ 1214{
1215 if ((loaded >> 16) < (current >> 16)) 1215 int rem;
1216 if (loaded > current)
1216 { 1217 {
1217 ecore_timer_add(1.0, _e_util_conf_timer_old, strdup(module_name)); 1218 ecore_timer_add(1.0, _e_util_conf_timer_new, strdup(module_name));
1218 return EINA_FALSE; 1219 return EINA_FALSE;
1219 } 1220 }
1220 else if (loaded > current) 1221 loaded -= loaded % 1000000, current -= current % 1000000;
1222 if (loaded < current)
1221 { 1223 {
1222 ecore_timer_add(1.0, _e_util_conf_timer_new, strdup(module_name)); 1224 ecore_timer_add(1.0, _e_util_conf_timer_old, strdup(module_name));
1223 return EINA_FALSE; 1225 return EINA_FALSE;
1224 } 1226 }
1225 1227
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index a4b30ca9a..591531421 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -464,17 +464,10 @@ static void
464_conf_new(void) 464_conf_new(void)
465{ 465{
466 conf = E_NEW(Config, 1); 466 conf = E_NEW(Config, 1);
467 conf->version = (MOD_CONFIG_FILE_EPOCH << 16); 467 conf->menu_augmentation = 1;
468 468
469#define IFMODCFG(v) if ((conf->version & 0xffff) < v) { 469 conf->version = MOD_CONFIG_FILE_VERSION;
470#define IFMODCFGEND } 470 e_config_save_queue();
471
472 IFMODCFG(0x008d);
473 conf->menu_augmentation = 1;
474 IFMODCFGEND;
475
476 conf->version = MOD_CONFIG_FILE_VERSION;
477 e_config_save_queue();
478} 471}
479 472
480static void 473static void
diff --git a/src/modules/conf/e_mod_main.h b/src/modules/conf/e_mod_main.h
index 85ccec277..8e2f324a6 100644
--- a/src/modules/conf/e_mod_main.h
+++ b/src/modules/conf/e_mod_main.h
@@ -1,10 +1,11 @@
1#ifndef E_MOD_MAIN_H 1#ifndef E_MOD_MAIN_H
2#define E_MOD_MAIN_H 2#define E_MOD_MAIN_H
3 3
4#define MOD_CONFIG_FILE_EPOCH 0x0001 4/* Increment for Major Changes */
5#define MOD_CONFIG_FILE_GENERATION 0x008d 5#define MOD_CONFIG_FILE_EPOCH 1
6#define MOD_CONFIG_FILE_VERSION \ 6/* Increment for Minor Changes (ie: user doesn't need a new config) */
7 ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 7#define MOD_CONFIG_FILE_GENERATION 0
8#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
8 9
9typedef struct _Config Config; 10typedef struct _Config Config;
10struct _Config 11struct _Config
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 98e1dc466..b41f5e551 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -413,68 +413,59 @@ _config_init()
413 if (!evry_conf) 413 if (!evry_conf)
414 { 414 {
415 evry_conf = E_NEW(Evry_Config, 1); 415 evry_conf = E_NEW(Evry_Config, 1);
416 evry_conf->version = (MOD_CONFIG_FILE_EPOCH << 16);
417 }
418 416
419#define IFMODCFG(v) if ((evry_conf->version & 0xffff) < v) { 417 /* setup defaults */
420#define IFMODCFGEND } 418 evry_conf->rel_x = 0.5;
421 419 evry_conf->rel_y = 0.43;
422 /* setup defaults */ 420 evry_conf->width = 455;
423 IFMODCFG(0x0001); 421 evry_conf->height = 430;
424 evry_conf->rel_x = 0.5; 422 evry_conf->scroll_animate = 1;
425 evry_conf->rel_y = 0.43; 423 evry_conf->scroll_speed = 10.0;
426 evry_conf->width = 455; 424 evry_conf->hide_input = 0;
427 evry_conf->height = 430; 425 evry_conf->hide_list = 0;
428 evry_conf->scroll_animate = 1; 426 evry_conf->quick_nav = 1;
429 evry_conf->scroll_speed = 10.0; 427 evry_conf->view_mode = VIEW_MODE_DETAIL;
430 evry_conf->hide_input = 0; 428 evry_conf->view_zoom = 0;
431 evry_conf->hide_list = 0; 429 evry_conf->cycle_mode = 0;
432 evry_conf->quick_nav = 1; 430 evry_conf->history_sort_mode = 0;
433 evry_conf->view_mode = VIEW_MODE_DETAIL; 431 evry_conf->edge_width = 340;
434 evry_conf->view_zoom = 0; 432 evry_conf->edge_height = 385;
435 evry_conf->cycle_mode = 0; 433 evry_conf->first_run = EINA_TRUE;
436 evry_conf->history_sort_mode = 0; 434
437 evry_conf->edge_width = 340; 435 pcc = E_NEW(Plugin_Config, 1);
438 evry_conf->edge_height = 385; 436 pcc->name = eina_stringshare_add("Start");
439 evry_conf->first_run = EINA_TRUE; 437 pcc->enabled = EINA_FALSE;
440 438 pcc->aggregate = EINA_FALSE;
441 pcc = E_NEW(Plugin_Config, 1); 439 pcc->top_level = EINA_TRUE;
442 pcc->name = eina_stringshare_add("Start"); 440 pcc->view_mode = VIEW_MODE_THUMB;
443 pcc->enabled = EINA_FALSE; 441 evry_conf->collections = eina_list_append(evry_conf->collections, pcc);
444 pcc->aggregate = EINA_FALSE; 442
445 pcc->top_level = EINA_TRUE; 443 pc = E_NEW(Plugin_Config, 1);
446 pcc->view_mode = VIEW_MODE_THUMB; 444 pc->name = eina_stringshare_add("Windows");
447 evry_conf->collections = eina_list_append(evry_conf->collections, pcc); 445 pc->enabled = EINA_TRUE;
448 446 pc->view_mode = VIEW_MODE_NONE;
449 pc = E_NEW(Plugin_Config, 1); 447 pcc->plugins = eina_list_append(pcc->plugins, pc);
450 pc->name = eina_stringshare_add("Windows"); 448
451 pc->enabled = EINA_TRUE; 449 pc = E_NEW(Plugin_Config, 1);
452 pc->view_mode = VIEW_MODE_NONE; 450 pc->name = eina_stringshare_add("Settings");
453 pcc->plugins = eina_list_append(pcc->plugins, pc); 451 pc->enabled = EINA_TRUE;
454 452 pc->view_mode = VIEW_MODE_NONE;
455 pc = E_NEW(Plugin_Config, 1); 453 pcc->plugins = eina_list_append(pcc->plugins, pc);
456 pc->name = eina_stringshare_add("Settings"); 454
457 pc->enabled = EINA_TRUE; 455 pc = E_NEW(Plugin_Config, 1);
458 pc->view_mode = VIEW_MODE_NONE; 456 pc->name = eina_stringshare_add("Files");
459 pcc->plugins = eina_list_append(pcc->plugins, pc); 457 pc->enabled = EINA_TRUE;
460 458 pc->view_mode = VIEW_MODE_NONE;
461 pc = E_NEW(Plugin_Config, 1); 459 pcc->plugins = eina_list_append(pcc->plugins, pc);
462 pc->name = eina_stringshare_add("Files"); 460
463 pc->enabled = EINA_TRUE; 461 pc = E_NEW(Plugin_Config, 1);
464 pc->view_mode = VIEW_MODE_NONE; 462 pc->name = eina_stringshare_add("Applications");
465 pcc->plugins = eina_list_append(pcc->plugins, pc); 463 pc->enabled = EINA_TRUE;
466 464 pc->view_mode = VIEW_MODE_NONE;
467 pc = E_NEW(Plugin_Config, 1); 465 pcc->plugins = eina_list_append(pcc->plugins, pc);
468 pc->name = eina_stringshare_add("Applications"); 466 evry_conf->width = 464;
469 pc->enabled = EINA_TRUE; 467 evry_conf->height = 366;
470 pc->view_mode = VIEW_MODE_NONE; 468 }
471 pcc->plugins = eina_list_append(pcc->plugins, pc);
472 IFMODCFGEND;
473
474 IFMODCFG(0x0003);
475 evry_conf->width = 464;
476 evry_conf->height = 366;
477 IFMODCFGEND;
478 469
479 evry_conf->version = MOD_CONFIG_FILE_VERSION; 470 evry_conf->version = MOD_CONFIG_FILE_VERSION;
480} 471}
diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h
index cddf7aa8f..82006bbd6 100644
--- a/src/modules/everything/e_mod_main.h
+++ b/src/modules/everything/e_mod_main.h
@@ -4,10 +4,11 @@
4#include "e.h" 4#include "e.h"
5#include "evry_api.h" 5#include "evry_api.h"
6 6
7#define MOD_CONFIG_FILE_EPOCH 0x0005 7/* Increment for Major Changes */
8#define MOD_CONFIG_FILE_GENERATION 0x0002 8#define MOD_CONFIG_FILE_EPOCH 1
9#define MOD_CONFIG_FILE_VERSION \ 9/* Increment for Minor Changes (ie: user doesn't need a new config) */
10 ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 10#define MOD_CONFIG_FILE_GENERATION 0
11#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
11 12
12#define SLIDE_LEFT 1 13#define SLIDE_LEFT 1
13#define SLIDE_RIGHT -1 14#define SLIDE_RIGHT -1
diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
index 2f798c66d..62ec632d3 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -1,10 +1,11 @@
1#include "e.h" 1#include "e.h"
2#include "evry_api.h" 2#include "evry_api.h"
3 3
4#define MOD_CONFIG_FILE_EPOCH 0x0001 4/* Increment for Major Changes */
5#define MOD_CONFIG_FILE_GENERATION 0x009d 5#define MOD_CONFIG_FILE_EPOCH 1
6#define MOD_CONFIG_FILE_VERSION \ 6/* Increment for Minor Changes (ie: user doesn't need a new config) */
7 ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 7#define MOD_CONFIG_FILE_GENERATION 0
8#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
8 9
9// FIXME clear cache on .desktop chage event 10// FIXME clear cache on .desktop chage event
10 11
@@ -1380,18 +1381,11 @@ _conf_new(void)
1380 if (!_conf) 1381 if (!_conf)
1381 { 1382 {
1382 _conf = E_NEW(Module_Config, 1); 1383 _conf = E_NEW(Module_Config, 1);
1383 _conf->version = (MOD_CONFIG_FILE_EPOCH << 16); 1384 /* setup defaults */
1385 _conf->cmd_terminal = eina_stringshare_add("/usr/bin/xterm -hold -e");
1386 _conf->cmd_sudo = eina_stringshare_add("/usr/bin/gksudo --preserve-env");
1384 } 1387 }
1385 1388
1386#define IFMODCFG(v) if ((_conf->version & 0xffff) < v) {
1387#define IFMODCFGEND }
1388
1389 /* setup defaults */
1390 IFMODCFG(0x009d);
1391 _conf->cmd_terminal = eina_stringshare_add("/usr/bin/xterm -hold -e");
1392 _conf->cmd_sudo = eina_stringshare_add("/usr/bin/gksudo --preserve-env");
1393 IFMODCFGEND;
1394
1395 _conf->version = MOD_CONFIG_FILE_VERSION; 1389 _conf->version = MOD_CONFIG_FILE_VERSION;
1396 1390
1397 /* e_config_save_queue(); */ 1391 /* e_config_save_queue(); */
diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c
index d6bd716ca..20c24b08e 100644
--- a/src/modules/everything/evry_plug_files.c
+++ b/src/modules/everything/evry_plug_files.c
@@ -8,10 +8,11 @@
8#include "evry_api.h" 8#include "evry_api.h"
9#include <Efreet_Trash.h> 9#include <Efreet_Trash.h>
10 10
11#define MOD_CONFIG_FILE_EPOCH 0x0001 11/* Increment for Major Changes */
12#define MOD_CONFIG_FILE_GENERATION 0x008d 12#define MOD_CONFIG_FILE_EPOCH 1
13#define MOD_CONFIG_FILE_VERSION \ 13/* Increment for Minor Changes (ie: user doesn't need a new config) */
14 ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 14#define MOD_CONFIG_FILE_GENERATION 0
15#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
15 16
16#define MAX_ITEMS 10 17#define MAX_ITEMS 10
17#define MAX_SHOWN 300 18#define MAX_SHOWN 300
@@ -1554,21 +1555,13 @@ static void
1554_conf_new(void) 1555_conf_new(void)
1555{ 1556{
1556 _conf = E_NEW(Module_Config, 1); 1557 _conf = E_NEW(Module_Config, 1);
1557 _conf->version = (MOD_CONFIG_FILE_EPOCH << 16); 1558 _conf->show_recent = 0;
1559 _conf->show_homedir = 1;
1560 _conf->search_recent = 1;
1561 _conf->cache_dirs = 0;
1562 _conf->search_cache = 0;
1558 1563
1559#define IFMODCFG(v) if ((_conf->version & 0xffff) < v) { 1564 _conf->version = MOD_CONFIG_FILE_VERSION;
1560#define IFMODCFGEND }
1561
1562 /* setup defaults */
1563 IFMODCFG(0x008d);
1564 _conf->show_recent = 0;
1565 _conf->show_homedir = 1;
1566 _conf->search_recent = 1;
1567 _conf->cache_dirs = 0;
1568 _conf->search_cache = 0;
1569 IFMODCFGEND;
1570
1571 _conf->version = MOD_CONFIG_FILE_VERSION;
1572} 1565}
1573 1566
1574static void 1567static void
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 2104d8f2a..4fc97cc41 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -279,77 +279,24 @@ _e_mod_fileman_config_load(void)
279 if (!fileman_config) 279 if (!fileman_config)
280 { 280 {
281 fileman_config = E_NEW(Config, 1); 281 fileman_config = E_NEW(Config, 1);
282 fileman_config->config_version = (MOD_CONFIG_FILE_EPOCH << 16); 282 fileman_config->view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
283 fileman_config->view.show_desktop_icons = 1;
284 fileman_config->icon.icon.w = 48;
285 fileman_config->icon.icon.h = 48;
286 fileman_config->icon.extension.show = 1;
287 fileman_config->list.sort.no_case = 1;
288 fileman_config->list.sort.dirs.first = 1;
289 fileman_config->view.show_toolbar = 1;
290 fileman_config->view.open_dirs_in_place = 1;
291 fileman_config->tooltip.delay = 1.0;
292 fileman_config->tooltip.size = 30.0;
293 fileman_config->view.show_sidebar = 1;
294 fileman_config->tooltip.enable = 1;
295 fileman_config->view.spring_delay = 1;
296 fileman_config->icon.max_thumb_size = 5;
297 fileman_config->view.toolbar_orient = E_GADCON_ORIENT_TOP;
283 } 298 }
284#define IFMODCFG(v) \
285 if ((fileman_config->config_version & 0xffff) < (v)) {
286#define IFMODCFGEND }
287
288 IFMODCFG(0x008d);
289 fileman_config->view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
290 fileman_config->view.open_dirs_in_place = 0;
291 fileman_config->view.selector = 0;
292 fileman_config->view.single_click = 0;
293 fileman_config->view.no_subdir_jump = 0;
294 fileman_config->view.show_full_path = 0;
295 fileman_config->view.show_desktop_icons = 1;
296 fileman_config->icon.icon.w = 48;
297 fileman_config->icon.icon.h = 48;
298 fileman_config->icon.fixed.w = 0;
299 fileman_config->icon.fixed.h = 0;
300 fileman_config->icon.extension.show = 1;
301 fileman_config->list.sort.no_case = 1;
302 fileman_config->list.sort.dirs.first = 1;
303 fileman_config->list.sort.dirs.last = 0;
304 fileman_config->selection.single = 0;
305 fileman_config->selection.windows_modifiers = 0;
306 IFMODCFGEND;
307
308 IFMODCFG(0x0101);
309 fileman_config->view.show_toolbar = 1;
310 fileman_config->view.open_dirs_in_place = 1;
311 IFMODCFGEND;
312
313 IFMODCFG(0x0104);
314 fileman_config->tooltip.delay = 1.0;
315 fileman_config->tooltip.size = 30.0;
316 IFMODCFGEND;
317
318 IFMODCFG(0x0105);
319 e_config->filemanager_single_click = fileman_config->view.single_click;
320 IFMODCFGEND;
321
322 IFMODCFG(0x0107);
323 fileman_config->view.show_sidebar = 1;
324 IFMODCFGEND;
325
326 IFMODCFG(0x0108);
327 fileman_config->view.menu_shows_files = 0;
328 IFMODCFGEND;
329
330 IFMODCFG(0x0109);
331 fileman_config->view.desktop_navigation = 0;
332 IFMODCFGEND;
333
334 IFMODCFG(0x0110);
335 fileman_config->tooltip.enable = 1;
336 IFMODCFGEND;
337
338 IFMODCFG(0x0114);
339 fileman_config->view.spring_delay = 1;
340 IFMODCFGEND;
341
342 IFMODCFG(0x0115);
343 fileman_config->icon.max_thumb_size = 5;
344 IFMODCFGEND;
345
346 IFMODCFG(0x0116);
347 fileman_config->icon.max_thumb_size = 0;
348 IFMODCFGEND;
349 299
350 IFMODCFG(0x0118);
351 fileman_config->view.toolbar_orient = E_GADCON_ORIENT_TOP;
352 IFMODCFGEND;
353 300
354 fileman_config->config_version = MOD_CONFIG_FILE_VERSION; 301 fileman_config->config_version = MOD_CONFIG_FILE_VERSION;
355 302
diff --git a/src/modules/fileman/e_mod_main.h b/src/modules/fileman/e_mod_main.h
index 3b1310ec5..866f078be 100644
--- a/src/modules/fileman/e_mod_main.h
+++ b/src/modules/fileman/e_mod_main.h
@@ -4,10 +4,10 @@
4#include "e.h" 4#include "e.h"
5 5
6/* Increment for Major Changes */ 6/* Increment for Major Changes */
7#define MOD_CONFIG_FILE_EPOCH 0x0001 7#define MOD_CONFIG_FILE_EPOCH 1
8/* Increment for Minor Changes (ie: user doesn't need a new config) */ 8/* Increment for Minor Changes (ie: user doesn't need a new config) */
9#define MOD_CONFIG_FILE_GENERATION 0x0118 9#define MOD_CONFIG_FILE_GENERATION 0
10#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 10#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
11 11
12typedef struct _Config Config; 12typedef struct _Config Config;
13 13
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index d133417fb..e8cd98a3f 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -197,8 +197,7 @@ _mixer_module_configuration_new(void)
197 E_Mixer_Module_Config *conf; 197 E_Mixer_Module_Config *conf;
198 198
199 conf = E_NEW(E_Mixer_Module_Config, 1); 199 conf = E_NEW(E_Mixer_Module_Config, 1);
200 if (!conf) 200 conf->desktop_notification = 1;
201 return NULL;
202 201
203 return conf; 202 return conf;
204} 203}
@@ -1376,15 +1375,8 @@ _mixer_module_configuration_setup(E_Mixer_Module_Context *ctxt)
1376 ctxt->module_conf_edd = module_edd; 1375 ctxt->module_conf_edd = module_edd;
1377 ctxt->conf = _mixer_module_configuration_load(module_edd); 1376 ctxt->conf = _mixer_module_configuration_load(module_edd);
1378 1377
1379#define IFMODCFG(v) if ((ctxt->conf->version & 0xffff) < v) { 1378 ctxt->conf->version = MOD_CONFIG_FILE_VERSION;
1380#define IFMODCFGEND } 1379 ctxt->desktop_notification = ctxt->conf->desktop_notification;
1381
1382 IFMODCFG(0x0003);
1383 ctxt->conf->desktop_notification = 1;
1384 IFMODCFGEND;
1385
1386 ctxt->conf->version = MOD_CONFIG_FILE_VERSION;
1387 ctxt->desktop_notification = ctxt->conf->desktop_notification;
1388} 1380}
1389 1381
1390static const char _act_increase[] = "volume_increase"; 1382static const char _act_increase[] = "volume_increase";
diff --git a/src/modules/mixer/e_mod_main.h b/src/modules/mixer/e_mod_main.h
index 8320366ec..0a7cf2fe5 100644
--- a/src/modules/mixer/e_mod_main.h
+++ b/src/modules/mixer/e_mod_main.h
@@ -4,10 +4,11 @@
4#include "e.h" 4#include "e.h"
5#include "e_mod_system.h" 5#include "e_mod_system.h"
6 6
7#define MOD_CONFIG_FILE_EPOCH 0x0000 7/* Increment for Major Changes */
8#define MOD_CONFIG_FILE_GENERATION 0x0004 8#define MOD_CONFIG_FILE_EPOCH 1
9#define MOD_CONFIG_FILE_VERSION \ 9/* Increment for Minor Changes (ie: user doesn't need a new config) */
10 ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 10#define MOD_CONFIG_FILE_GENERATION 0
11#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
11 12
12typedef struct E_Mixer_Gadget_Config 13typedef struct E_Mixer_Gadget_Config
13{ 14{
diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c
index 97b75587d..40263a435 100644
--- a/src/modules/notification/e_mod_main.c
+++ b/src/modules/notification/e_mod_main.c
@@ -171,7 +171,7 @@ e_modapi_init(E_Module *m)
171 if (notification_cfg && 171 if (notification_cfg &&
172 !(e_util_module_config_check(_("Notification Module"), 172 !(e_util_module_config_check(_("Notification Module"),
173 notification_cfg->version, 173 notification_cfg->version,
174 MOD_CFG_FILE_VERSION))) 174 MOD_CONFIG_FILE_VERSION)))
175 { 175 {
176 _notification_cfg_free(notification_cfg); 176 _notification_cfg_free(notification_cfg);
177 notification_cfg = NULL; 177 notification_cfg = NULL;
@@ -263,7 +263,7 @@ _notification_cfg_new(void)
263 263
264 cfg = E_NEW(Config, 1); 264 cfg = E_NEW(Config, 1);
265 cfg->cfd = NULL; 265 cfg->cfd = NULL;
266 cfg->version = MOD_CFG_FILE_VERSION; 266 cfg->version = MOD_CONFIG_FILE_VERSION;
267 cfg->show_low = 0; 267 cfg->show_low = 0;
268 cfg->show_normal = 1; 268 cfg->show_normal = 1;
269 cfg->show_critical = 1; 269 cfg->show_critical = 1;
diff --git a/src/modules/notification/e_mod_main.h b/src/modules/notification/e_mod_main.h
index 7be249e1b..ecc6bfc37 100644
--- a/src/modules/notification/e_mod_main.h
+++ b/src/modules/notification/e_mod_main.h
@@ -4,10 +4,11 @@
4#include "e.h" 4#include "e.h"
5#include <E_Notification_Daemon.h> 5#include <E_Notification_Daemon.h>
6 6
7#define MOD_CFG_FILE_EPOCH 0x0002 7/* Increment for Major Changes */
8#define MOD_CFG_FILE_GENERATION 0x0007 8#define MOD_CONFIG_FILE_EPOCH 1
9#define MOD_CFG_FILE_VERSION \ 9/* Increment for Minor Changes (ie: user doesn't need a new config) */
10((MOD_CFG_FILE_EPOCH << 16) | MOD_CFG_FILE_GENERATION) 10#define MOD_CONFIG_FILE_GENERATION 0
11#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
11 12
12typedef enum _Popup_Corner Popup_Corner; 13typedef enum _Popup_Corner Popup_Corner;
13typedef struct _Config Config; 14typedef struct _Config Config;
diff --git a/src/modules/physics/e_mod_physics_cfdata.h b/src/modules/physics/e_mod_physics_cfdata.h
index 90ebae0d2..2cf5f4585 100644
--- a/src/modules/physics/e_mod_physics_cfdata.h
+++ b/src/modules/physics/e_mod_physics_cfdata.h
@@ -4,10 +4,10 @@
4typedef struct _Config Config; 4typedef struct _Config Config;
5 5
6/* Increment for Major Changes */ 6/* Increment for Major Changes */
7#define MOD_CONFIG_FILE_EPOCH 0x0001 7#define MOD_CONFIG_FILE_EPOCH 1
8/* Increment for Minor Changes (ie: user doesn't need a new config) */ 8/* Increment for Minor Changes (ie: user doesn't need a new config) */
9#define MOD_CONFIG_FILE_GENERATION 0x0001 9#define MOD_CONFIG_FILE_GENERATION 0
10#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 10#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
11 11
12struct _Config 12struct _Config
13{ 13{
diff --git a/src/modules/quickaccess/e_mod_main.h b/src/modules/quickaccess/e_mod_main.h
index 037d19de7..53b598f21 100644
--- a/src/modules/quickaccess/e_mod_main.h
+++ b/src/modules/quickaccess/e_mod_main.h
@@ -8,10 +8,10 @@
8#include "e.h" 8#include "e.h"
9 9
10/* Increment for Major Changes */ 10/* Increment for Major Changes */
11#define MOD_CONFIG_FILE_EPOCH 0x0001 11#define MOD_CONFIG_FILE_EPOCH 1
12/* Increment for Minor Changes (ie: user doesn't need a new config) */ 12/* Increment for Minor Changes (ie: user doesn't need a new config) */
13#define MOD_CONFIG_FILE_GENERATION 0x0001 13#define MOD_CONFIG_FILE_GENERATION 0
14#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION) 14#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
15 15
16typedef struct E_Quick_Access_Entry 16typedef struct E_Quick_Access_Entry
17{ 17{