From 74329844db90ef15f70f3db0f76ee0b6d650f299 Mon Sep 17 00:00:00 2001
From: subhransu mohanty <sub.mohanty@samsung.com>
Date: Tue, 27 Aug 2019 08:04:43 -0400
Subject: [PATCH] edje/load: pass Edje_File instead of Edje to 
 _edje_extract_mo_files()

Summary:
Why :
1. The function operates on the Edje_File level not on Edje object
   level , so express it clearly in the function argument.
2. if its clear that this function works on file level then
   this should be called when the theme file loaded for the first time
   not on every Edje object creation.

Reviewers: Hermet, zmike, raster, cedric

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9753
---
 src/lib/edje/edje_load.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 6a7f143..9f1ea3d 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -55,7 +55,7 @@ _edje_smart_nested_smart_class_new(void)
 }
 
 void
-_edje_extract_mo_files(Edje *ed)
+_edje_extract_mo_files(Edje_File *edf)
 {
    Eina_Strbuf *mo_id_str;
    const void *data;
@@ -69,19 +69,19 @@ _edje_extract_mo_files(Edje *ed)
 
    cache_path = efreet_cache_home_get();
 
-   t = eina_file_mtime_get(ed->file->f);
-   sz = eina_file_size_get(ed->file->f);
-   filename = eina_file_filename_get(ed->file->f);
+   t = eina_file_mtime_get(edf->f);
+   sz = eina_file_size_get(edf->f);
+   filename = eina_file_filename_get(edf->f);
    crc = eina_crc(filename, strlen(filename), 0xffffffff, EINA_TRUE);
 
-   snprintf(ed->file->fid, sizeof(ed->file->fid), "%lld-%lld-%x",
+   snprintf(edf->fid, sizeof(edf->fid), "%lld-%lld-%x",
             (long long int)t,
             (long long int)sz,
             crc);
 
    mo_id_str = eina_strbuf_new();
 
-   for (i = 0; i < ed->file->mo_dir->mo_entries_count; i++)
+   for (i = 0; i < edf->mo_dir->mo_entries_count; i++)
      {
         Edje_Mo *mo_entry;
         char out[PATH_MAX + PATH_MAX + 128];
@@ -89,13 +89,13 @@ _edje_extract_mo_files(Edje *ed)
         char *sub_str;
         char *mo_src;
 
-        mo_entry = &ed->file->mo_dir->mo_entries[i];
+        mo_entry = &edf->mo_dir->mo_entries[i];
 
         eina_strbuf_append_printf(mo_id_str,
                                   "edje/mo/%i/%s/LC_MESSAGES",
                                   mo_entry->id,
                                   mo_entry->locale);
-        data = eet_read_direct(ed->file->ef,
+        data = eet_read_direct(edf->ef,
                                eina_strbuf_string_get(mo_id_str),
                                &len);
 
@@ -112,10 +112,10 @@ _edje_extract_mo_files(Edje *ed)
                sub_str[1] = 'm';
 
              snprintf(out, sizeof(out), "%s/%s-%s",
-                      outdir, ed->file->fid, mo_src);
+                      outdir, edf->fid, mo_src);
              if (ecore_file_exists(out))
                {
-                  if (ed->file->mtime > ecore_file_mod_time(out))
+                  if (edf->mtime > ecore_file_mod_time(out))
                     ecore_file_remove(out);
                }
              if (!ecore_file_exists(out))
@@ -867,7 +867,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
 
    ed->has_entries = EINA_FALSE;
    if (ed->file && ed->file->mo_dir)
-     _edje_extract_mo_files(ed);
+     _edje_extract_mo_files(ed->file);
 
    if (ed->collection)
      {
-- 
2.7.4