New fangWin and Widget structures, and modify fangWin stuff to use them.

1 files changed, 12 insertions, 8 deletions

diff --git a/src/extantz/chat.c b/src/extantz/chat.c
index 4ad5033..ef40d08 100644
--- a/src/extantz/chat.c
+++ b/src/extantz/chat.c
@@ -1,19 +1,22 @@
 #include "extantz.h"
 
-void chat_add(globals *ourGlobals)
+
+fangWin *chat_add(globals *ourGlobals)
 {
-  Evas_Object *win, *bx, *en;
+  fangWin *me;
+  Widget  *wid;
+  Evas_Object *bx, *en;
 
-  win = fang_win_add(ourGlobals);
+  me = fang_win_add(ourGlobals);
 
-  bx = eo_add(ELM_OBJ_BOX_CLASS, win);
+  bx = eo_add(ELM_OBJ_BOX_CLASS, me->win);
     eo_do(bx,
     evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
     evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL)
        );
-  elm_win_resize_object_add(win, bx);
+  elm_win_resize_object_add(me->win, bx);
 
-  en = eo_add(ELM_OBJ_ENTRY_CLASS, win);
+  en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win);
   elm_object_text_set(en, "History is shown here");
   eo_do(en,
     elm_obj_entry_scrollable_set(EINA_TRUE),
@@ -25,7 +28,7 @@ void chat_add(globals *ourGlobals)
   elm_box_pack_end(bx, en);
   eo_unref(en);
 
-  en = eo_add(ELM_OBJ_ENTRY_CLASS, win);
+  en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win);
   elm_object_text_set(en, "");
   eo_do(en,
     elm_obj_entry_scrollable_set(EINA_TRUE),
@@ -42,5 +45,6 @@ void chat_add(globals *ourGlobals)
   evas_object_show(bx);
   eo_unref(bx);
 
-  fang_win_complete(ourGlobals, win, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
+  fang_win_complete(ourGlobals, me, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
+  return me;
 }