summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen 'Okra' Houston <smhouston88@gmail.com>2017-01-25 16:24:25 -0600
committerStephen 'Okra' Houston <smhouston88@gmail.com>2017-01-25 16:24:53 -0600
commit35e9501637e7e14e6508c0c8eebe8a2055fce2d7 (patch)
treeeef0f1506b38970564d66f07e9bb847cc987bc58
parent422499e512eb90698e0b15674556c3f84a52ffcf (diff)
Enlightenment: Whitelist and autoload the sysinfo gadgets.
-rw-r--r--src/bin/e_config.c23
-rw-r--r--src/bin/e_config.h2
-rw-r--r--src/bin/e_module.c1
3 files changed, 25 insertions, 1 deletions
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 778d39c69..b74601084 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1478,6 +1478,29 @@ e_config_load(void)
1478 e_config->modules = eina_list_append(e_config->modules, module); 1478 e_config->modules = eina_list_append(e_config->modules, module);
1479 } 1479 }
1480 } 1480 }
1481 CONFIG_VERSION_CHECK(23)
1482 {
1483 Eina_List *l;
1484 E_Config_Module *em, *module;
1485 Eina_Bool sysinfo_en = EINA_FALSE;
1486
1487 CONFIG_VERSION_UPDATE_INFO(23);
1488
1489 EINA_LIST_FOREACH(e_config->modules, l, em)
1490 {
1491 if (!em->enabled) continue;
1492 if (eina_streq(em->name, "sysinfo"))
1493 sysinfo_en = EINA_TRUE;
1494 }
1495 if (!sysinfo_en)
1496 {
1497 module = E_NEW(E_Config_Module, 1);
1498 module->name = eina_stringshare_add("sysinfo");
1499 module->enabled = 1;
1500 module->delayed = 1;
1501 e_config->modules = eina_list_append(e_config->modules, module);
1502 }
1503 }
1481 } 1504 }
1482 if (!e_config->remember_internal_fm_windows) 1505 if (!e_config->remember_internal_fm_windows)
1483 e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS); 1506 e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 2a157315f..0a2dd81ac 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -46,7 +46,7 @@ typedef enum
46/* increment this whenever a new set of config values are added but the users 46/* increment this whenever a new set of config values are added but the users
47 * config doesn't need to be wiped - simply new values need to be put in 47 * config doesn't need to be wiped - simply new values need to be put in
48 */ 48 */
49#define E_CONFIG_FILE_GENERATION 22 49#define E_CONFIG_FILE_GENERATION 23
50#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) 50#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
51 51
52#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!! 52#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 3cb794cfe..49d5104aa 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -1033,6 +1033,7 @@ _e_module_whitelist_check(void)
1033 "shot", 1033 "shot",
1034 "start", 1034 "start",
1035 "syscon", 1035 "syscon",
1036 "sysinfo",
1036 "systray", 1037 "systray",
1037 "tasks", 1038 "tasks",
1038 "teamwork", 1039 "teamwork",