Change behavior of e_accessibility_conf_init

Problems with loading configuration file
("module.screen_reader.accessibility") will not cause e_mod_main to fail
anymore.
In case of configuration file problems default values will be loaded.

Change-Id: If61d00c6b419ba22863e3a741dd3e97d45f856f1

diff --git a/src/e_mod_accessibility_conf.c b/src/e_mod_accessibility_conf.c
index 158b92b..6add0cf 100644 (file)
--- a/src/e_mod_accessibility_conf.c
+++ b/src/e_mod_accessibility_conf.c
@@ -15,25 +15,29 @@ typedef struct _E_Accessibility_Config_Data
 
 E_Accessibility_Config_Data *aconfig = NULL;
 
-void
+static void
 _e_accessibility_conf_value_check( void )
 {
-   E_Accessibility_Conf_Edd *conf = aconfig->conf;
+   if (!aconfig->conf)
+      aconfig->conf = E_NEW(E_Accessibility_Conf_Edd, 1);
+   EINA_SAFETY_ON_NULL_RETURN(aconfig->conf);
 
-   if (conf->gesture.quickpanel_area_size <= 0) conf->gesture.quickpanel_area_size = DEFAULT_QUICKPANEL_AREA_SIZE;
-   if (conf->gesture.longpress_timeout <= 0.0) conf->gesture.longpress_timeout = DEFAULT_LONGPRESS_TIMEOUT;
+   if (aconfig->conf->gesture.quickpanel_area_size <= 0)
+      aconfig->conf->gesture.quickpanel_area_size = DEFAULT_QUICKPANEL_AREA_SIZE;
+   if (aconfig->conf->gesture.longpress_timeout <= 0.0)
+      aconfig->conf->gesture.longpress_timeout = DEFAULT_LONGPRESS_TIMEOUT;
 }
 
-Eina_Bool
+void
 e_accessibility_conf_init(E_Module *m)
 {
    aconfig = E_NEW(E_Accessibility_Config_Data, 1);
    if (!aconfig)
-      return EINA_FALSE;
+      return;
    aconfig->module = m;
    aconfig->conf_edd = E_CONFIG_DD_NEW(ACCESSIBILITY_CONFIG, E_Accessibility_Conf_Edd);
    if (!aconfig->conf_edd)
-      return EINA_FALSE;
+      return;
 
    E_CONFIG_VAL(aconfig->conf_edd, E_Accessibility_Conf_Edd, gesture.quickpanel_area_size, UINT);
    E_CONFIG_VAL(aconfig->conf_edd, E_Accessibility_Conf_Edd, gesture.longpress_timeout, DOUBLE);
@@ -42,11 +46,9 @@ e_accessibility_conf_init(E_Module *m)
 
    if (!aconfig->conf)
      {
-        ERR("Failed to find %s config file.", MODULE_ACCESSIBILITY);
-        return EINA_FALSE;
+        WRN("Failed to find %s config file.", MODULE_ACCESSIBILITY);
      }
    _e_accessibility_conf_value_check();
-   return EINA_TRUE;
 }
 
 void

diff --git a/src/e_mod_accessibility_conf.h b/src/e_mod_accessibility_conf.h
index 272c4a4..d5dfd0b 100644 (file)
--- a/src/e_mod_accessibility_conf.h
+++ b/src/e_mod_accessibility_conf.h
@@ -10,7 +10,7 @@ typedef struct _E_Accessibility_Conf_Edd {
        } gesture;
 } E_Accessibility_Conf_Edd;
 
-Eina_Bool e_accessibility_conf_init();
+void e_accessibility_conf_init(E_Module *m);
 void e_accessibility_conf_shutdown();
 E_Accessibility_Conf_Edd* e_accessibility_get_configuration();
 

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 6a493c2..1a5a07a 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -684,11 +684,7 @@ e_modapi_init(E_Module *m)
       ERROR("AT-SPI vconf initialization failed.");
       return NULL;
    }
-   if (!e_accessibility_conf_init(m))
-   {
-     ERROR("Accessibility config initialization failed.");
-     return NULL;
-   }
+   e_accessibility_conf_init(m);
 
    return m;
 }