davemds pushed a commit to branch master.

http://git.enlightenment.org/enlightenment/modules/edgar.git/commit/?id=f36ea5a7c24fab678fe7fdde43e41484bf81a6a4

commit f36ea5a7c24fab678fe7fdde43e41484bf81a6a4
Author: Dave Andreoli <[email protected]>
Date:   Fri Nov 28 20:17:40 2014 +0100

    Fix for recent changes in e19
---
 src/e_mod_edgar.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/e_mod_edgar.c b/src/e_mod_edgar.c
index d6234a0..1b83784 100644
--- a/src/e_mod_edgar.c
+++ b/src/e_mod_edgar.c
@@ -448,8 +448,7 @@ edgar_menu_info_cb(void *data, E_Menu *m, E_Menu_Item *mi)
 
    // dialog
 #ifdef HAVE_E19
-   E_Comp *con;
-   con = e_manager_current_get()->comp;
+   Evas_Object *con = NULL;
 #else
    E_Container *con;
    con = e_container_current_get(e_manager_current_get());
@@ -459,18 +458,24 @@ edgar_menu_info_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    e_dialog_title_set(dia, "Gadget info");
    e_dialog_button_add(dia, "Close", NULL, NULL, NULL);
 
+#ifdef HAVE_E19
+   Evas *evas = evas_object_evas_get(dia->win);
+#else
+   Evas *evas = dia->win->evas;
+#endif
+
    // hbox
-   hbox = e_widget_list_add(dia->win->evas, 0, 1);
+   hbox = e_widget_list_add(evas, 0, 1);
 
    // icon
-   icon = edje_object_add(dia->win->evas);
+   icon = edje_object_add(evas);
    edgar_theme_object_set(gadget, icon, "icon");
-   img = e_widget_image_add_from_object(dia->win->evas, icon,
+   img = e_widget_image_add_from_object(evas, icon,
                                         70 * e_scale, 70 * e_scale);
    e_widget_list_object_append(hbox, img, 1, 0, 0.0);
 
    // text
-   tb = e_widget_textblock_add(dia->win->evas);
+   tb = e_widget_textblock_add(evas);
    e_widget_textblock_markup_set(tb, eina_strbuf_string_get(strbuf));
    e_widget_size_min_set(tb, 250 * e_scale, 100 * e_scale);
    e_widget_list_object_append(hbox, tb, 1, 1, 0.0);

-- 


Reply via email to