summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Andreoli <dave@gurumeditation.it>2014-11-28 20:17:40 +0100
committerDave Andreoli <dave@gurumeditation.it>2014-11-28 20:17:40 +0100
commitf36ea5a7c24fab678fe7fdde43e41484bf81a6a4 (patch)
tree0af907de6102b0a888e9d97611bd99dc3b7ab82c
parentc856c024eb1931ee38125f700692280def84efa5 (diff)
Fix for recent changes in e19
-rw-r--r--src/e_mod_edgar.c17
1 files 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)
448 448
449 // dialog 449 // dialog
450#ifdef HAVE_E19 450#ifdef HAVE_E19
451 E_Comp *con; 451 Evas_Object *con = NULL;
452 con = e_manager_current_get()->comp;
453#else 452#else
454 E_Container *con; 453 E_Container *con;
455 con = e_container_current_get(e_manager_current_get()); 454 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)
459 e_dialog_title_set(dia, "Gadget info"); 458 e_dialog_title_set(dia, "Gadget info");
460 e_dialog_button_add(dia, "Close", NULL, NULL, NULL); 459 e_dialog_button_add(dia, "Close", NULL, NULL, NULL);
461 460
461#ifdef HAVE_E19
462 Evas *evas = evas_object_evas_get(dia->win);
463#else
464 Evas *evas = dia->win->evas;
465#endif
466
462 // hbox 467 // hbox
463 hbox = e_widget_list_add(dia->win->evas, 0, 1); 468 hbox = e_widget_list_add(evas, 0, 1);
464 469
465 // icon 470 // icon
466 icon = edje_object_add(dia->win->evas); 471 icon = edje_object_add(evas);
467 edgar_theme_object_set(gadget, icon, "icon"); 472 edgar_theme_object_set(gadget, icon, "icon");
468 img = e_widget_image_add_from_object(dia->win->evas, icon, 473 img = e_widget_image_add_from_object(evas, icon,
469 70 * e_scale, 70 * e_scale); 474 70 * e_scale, 70 * e_scale);
470 e_widget_list_object_append(hbox, img, 1, 0, 0.0); 475 e_widget_list_object_append(hbox, img, 1, 0, 0.0);
471 476
472 // text 477 // text
473 tb = e_widget_textblock_add(dia->win->evas); 478 tb = e_widget_textblock_add(evas);
474 e_widget_textblock_markup_set(tb, eina_strbuf_string_get(strbuf)); 479 e_widget_textblock_markup_set(tb, eina_strbuf_string_get(strbuf));
475 e_widget_size_min_set(tb, 250 * e_scale, 100 * e_scale); 480 e_widget_size_min_set(tb, 250 * e_scale, 100 * e_scale);
476 e_widget_list_object_append(hbox, tb, 1, 1, 0.0); 481 e_widget_list_object_append(hbox, tb, 1, 1, 0.0);