e17: fix e_utils_config_check, no need to pass both epoch and version

SVN revision: 63029

diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index d05145a..b5128b9 100644 (file)
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1571,14 +1571,14 @@ _e_util_conf_timer_new(void *data)
 }
 
 EAPI Eina_Bool
-e_util_module_config_check(const char *module_name, int conf, int epoch, int version)
+e_util_module_config_check(const char *module_name, int loaded, int current)
 {
-   if ((conf >> 16) < epoch)
+   if ((loaded >> 16) < (current >> 16))
      {
        ecore_timer_add(1.0, _e_util_conf_timer_old, strdup(module_name));
        return EINA_FALSE;
      }
-   else if (conf > version)
+   else if (loaded > current)
      {
        ecore_timer_add(1.0, _e_util_conf_timer_new, strdup(module_name));
        return EINA_FALSE;

diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index 07d96b7..8e518c0 100644 (file)
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -67,7 +67,9 @@ EAPI int          e_util_dir_check(const char *dir);
 EAPI void         e_util_defer_object_del(E_Object *obj);
 EAPI const char  *e_util_winid_str_get(Ecore_X_Window win);
 EAPI void         e_util_win_auto_resize_fill(E_Win *win);
-EAPI Eina_Bool    e_util_module_config_check(const char *module_name, int conf, int epoch, int version);
+/* check if loaded config version matches the current version, show a
+   dialog warning if loaded version is older or newer than current */
+EAPI Eina_Bool    e_util_module_config_check(const char *module_name, int loaded, int current);
 
 EAPI E_Dialog                   *e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data);
 EAPI E_Util_Image_Import_Handle *e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data);

diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index c5c5393..eb76db5 100644 (file)
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -416,9 +416,9 @@ _config_init()
 #undef D
    evry_conf = e_config_domain_load("module.everything", conf_edd);
 
-   if (evry_conf && !e_util_module_config_check
-       (_("Everything Module"), evry_conf->version,
-       MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
+   if (evry_conf && !e_util_module_config_check(_("Everything Module"),
+                                               evry_conf->version,
+                                               MOD_CONFIG_FILE_VERSION))
      _config_free();
 
    if (!evry_conf)

diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
index e733b04..fa06297 100644 (file)
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -1384,9 +1384,9 @@ _conf_init(E_Module *m)
    _conf = e_config_domain_load("module.everything-apps", conf_edd);
 
 
-   if (_conf && !e_util_module_config_check
-       (_("Everything Applications"), _conf->version,
-       MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
+   if (_conf && !e_util_module_config_check(_("Everything Applications"),
+                                           _conf->version,
+                                           MOD_CONFIG_FILE_VERSION))
      _conf_free();
 
    _conf_new();

diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c
index 8280b37..4f2773e 100644 (file)
--- a/src/modules/everything/evry_plug_files.c
+++ b/src/modules/everything/evry_plug_files.c
@@ -473,7 +473,6 @@ _dir_watcher(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event eve
 
         _item_fill(file);
         p->files = eina_list_append(p->files, file);
-
         break;
 
       case ECORE_FILE_EVENT_DELETED_FILE:
@@ -1387,7 +1386,8 @@ _plugins_init(const Evry_API *api)
        p->config->top_level = EINA_FALSE;
        p->config->min_query = 3;
      }
-
+   _plugins = eina_list_append(_plugins, p);
+   
    p = EVRY_PLUGIN_BASE("Recent Files", _module_icon, EVRY_TYPE_FILE,
                        _recentf_begin, _finish, _recentf_fetch);
    p->browse = &_recentf_browse;
@@ -1398,7 +1398,8 @@ _plugins_init(const Evry_API *api)
        p->config->top_level = EINA_FALSE;
        p->config->min_query = 3;
      }
-
+   _plugins = eina_list_append(_plugins, p);
+   
    return EINA_TRUE;
 }
 
@@ -1611,9 +1612,9 @@ _conf_init(E_Module *m)
 
    _conf = e_config_domain_load("module.everything-files", conf_edd);
 
-   if (_conf && !e_util_module_config_check
-       (_("Everything Files"), _conf->version,
-       MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
+   if (_conf && !e_util_module_config_check(_("Everything Files"),
+                                           _conf->version,
+                                           MOD_CONFIG_FILE_VERSION))
          _conf_free();
 
    if (!_conf) _conf_new();

diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index bbeae86..89b7b49 100644 (file)
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -1253,7 +1253,7 @@ _mixer_module_configuration_load(E_Config_DD *module_conf_edd)
      return _mixer_module_configuration_new();
    
    if (conf && !e_util_module_config_check (_("Mixer Module"), conf->version,
-                                           MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
+                                           MOD_CONFIG_FILE_VERSION))
      {
        _mixer_module_configuration_free(conf);
        return _mixer_module_configuration_new();