[EGIT] [apps/ecrire] master 01/01: ecrire: instances

[Alastair Poole]

netstar pushed a commit to branch master.

http://git.enlightenment.org/apps/ecrire.git/commit/?id=2b5546e0a208fd67878c7354aacd00f67ece4c5d

commit 2b5546e0a208fd67878c7354aacd00f67ece4c5d
Author: Alastair Poole <nets...@gmail.com>
Date:   Wed Apr 7 11:32:37 2021 +0100

    ecrire: instances
---
 src/bin/main.c             | 1 -
 src/bin/ui/alerts.c        | 8 ++++----
 src/bin/ui/goto_dialog.c   | 4 ++--
 src/bin/ui/search_dialog.c | 4 ++--
 src/bin/ui/ui.h            | 6 +++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index 1e2990e..5fd3202 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -834,7 +834,6 @@ elm_main(int argc, char **argv)
 
    elm_run();
 
-
    ecrire_cfg_shutdown();
    eina_log_domain_unregister(_ecrire_log_dom);
    _ecrire_log_dom = -1;
diff --git a/src/bin/ui/alerts.c b/src/bin/ui/alerts.c
index 6131356..64e5a6a 100644
--- a/src/bin/ui/alerts.c
+++ b/src/bin/ui/alerts.c
@@ -9,11 +9,11 @@ static void (*done_cb)(void *data);
 static void
 _discard(void *data, Evas_Object *obj EINA_UNUSED, void *event_info 
EINA_UNUSED)
 {
-   Ecrire_Entry *ent = done_data;
+   Ecrire_Entry *inst = done_data;
 
    if (data)
      evas_object_del(data);
-   done_cb(ent);
+   done_cb(inst);
 }
 
 static void
@@ -34,10 +34,10 @@ _fs_save_done(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED,
 static void
 _save(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Ecrire_Entry *ent = done_data;
+   Ecrire_Entry *inst = done_data;
 
    evas_object_del(data);
-   ecrire_save(ent, _fs_save_done);
+   ecrire_save(inst, _fs_save_done);
 }
 
 static void
diff --git a/src/bin/ui/goto_dialog.c b/src/bin/ui/goto_dialog.c
index 25f5bd0..6970ba0 100644
--- a/src/bin/ui/goto_dialog.c
+++ b/src/bin/ui/goto_dialog.c
@@ -57,9 +57,9 @@ _my_parent_del(void *data EINA_UNUSED, Evas_Object *obj, void 
*event_info)
 }
 
 Evas_Object *
-ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *ent)
+ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *inst)
 {
-   Evas_Object *entry = ent->entry;
+   Evas_Object *entry = inst->entry;
    Evas_Object *popup, *bx, *hbx, *btn;
 
    if (goto_popup)
diff --git a/src/bin/ui/search_dialog.c b/src/bin/ui/search_dialog.c
index 85bbea9..c521d0b 100644
--- a/src/bin/ui/search_dialog.c
+++ b/src/bin/ui/search_dialog.c
@@ -129,9 +129,9 @@ my_win_del(void *data EINA_UNUSED, Evas_Object *obj, void 
*event_info)
 }
 
 Evas_Object *
-ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *ent)
+ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *inst)
 {
-   Evas_Object *entry = ent->entry;
+   Evas_Object *entry = inst->entry;
    Evas_Object *win, *bg, *tbl, *bx, *exp, *pad, *lbl, *hbx, *btn;
 
    if (search_win)
diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h
index ebf869b..08e34fa 100644
--- a/src/bin/ui/ui.h
+++ b/src/bin/ui/ui.h
@@ -5,9 +5,9 @@
 
 void ui_file_open_save_dialog_open(Evas_Object *parent, Eina_Bool save, 
Evas_Smart_Cb func, void *data);
 
-Evas_Object *ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *ent);
-Evas_Object *ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *ent);
-Evas_Object *ui_settings_open(Evas_Object *parent, Ecrire_Entry *ent);
+Evas_Object *ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *inst);
+Evas_Object *ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *inst);
+Evas_Object *ui_settings_open(Evas_Object *parent, Ecrire_Entry *inst);
 
 void ui_alert_need_saving(Evas_Object *entry, void (*done)(void *data), void 
*data);
 

--