summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Poole <netstar@gmail.com>2021-04-07 11:32:37 +0100
committerAlastair Poole <netstar@gmail.com>2021-04-07 11:32:37 +0100
commit2b5546e0a208fd67878c7354aacd00f67ece4c5d (patch)
treef96530aa10e9000e99586620b76fc50a9ce6ea21
parent642847fa741e109dc0fe00951ad7a266442a9d78 (diff)
ecrire: instances
-rw-r--r--src/bin/main.c1
-rw-r--r--src/bin/ui/alerts.c8
-rw-r--r--src/bin/ui/goto_dialog.c4
-rw-r--r--src/bin/ui/search_dialog.c4
-rw-r--r--src/bin/ui/ui.h6
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)
834 834
835 elm_run(); 835 elm_run();
836 836
837
838 ecrire_cfg_shutdown(); 837 ecrire_cfg_shutdown();
839 eina_log_domain_unregister(_ecrire_log_dom); 838 eina_log_domain_unregister(_ecrire_log_dom);
840 _ecrire_log_dom = -1; 839 _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);
9static void 9static void
10_discard(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 10_discard(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
11{ 11{
12 Ecrire_Entry *ent = done_data; 12 Ecrire_Entry *inst = done_data;
13 13
14 if (data) 14 if (data)
15 evas_object_del(data); 15 evas_object_del(data);
16 done_cb(ent); 16 done_cb(inst);
17} 17}
18 18
19static void 19static void
@@ -34,10 +34,10 @@ _fs_save_done(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
34static void 34static void
35_save(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 35_save(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
36{ 36{
37 Ecrire_Entry *ent = done_data; 37 Ecrire_Entry *inst = done_data;
38 38
39 evas_object_del(data); 39 evas_object_del(data);
40 ecrire_save(ent, _fs_save_done); 40 ecrire_save(inst, _fs_save_done);
41} 41}
42 42
43static void 43static 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)
57} 57}
58 58
59Evas_Object * 59Evas_Object *
60ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *ent) 60ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *inst)
61{ 61{
62 Evas_Object *entry = ent->entry; 62 Evas_Object *entry = inst->entry;
63 Evas_Object *popup, *bx, *hbx, *btn; 63 Evas_Object *popup, *bx, *hbx, *btn;
64 64
65 if (goto_popup) 65 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)
129} 129}
130 130
131Evas_Object * 131Evas_Object *
132ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *ent) 132ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *inst)
133{ 133{
134 Evas_Object *entry = ent->entry; 134 Evas_Object *entry = inst->entry;
135 Evas_Object *win, *bg, *tbl, *bx, *exp, *pad, *lbl, *hbx, *btn; 135 Evas_Object *win, *bg, *tbl, *bx, *exp, *pad, *lbl, *hbx, *btn;
136 136
137 if (search_win) 137 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 @@
5 5
6void ui_file_open_save_dialog_open(Evas_Object *parent, Eina_Bool save, Evas_Smart_Cb func, void *data); 6void ui_file_open_save_dialog_open(Evas_Object *parent, Eina_Bool save, Evas_Smart_Cb func, void *data);
7 7
8Evas_Object *ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *ent); 8Evas_Object *ui_find_dialog_open(Evas_Object *parent, Ecrire_Entry *inst);
9Evas_Object *ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *ent); 9Evas_Object *ui_goto_dialog_open(Evas_Object *parent, Ecrire_Entry *inst);
10Evas_Object *ui_settings_open(Evas_Object *parent, Ecrire_Entry *ent); 10Evas_Object *ui_settings_open(Evas_Object *parent, Ecrire_Entry *inst);
11 11
12void ui_alert_need_saving(Evas_Object *entry, void (*done)(void *data), void *data); 12void ui_alert_need_saving(Evas_Object *entry, void (*done)(void *data), void *data);
13 13