diff options
author | Savio Sena <savio@expertisesolutions.com.br> | 2014-09-27 11:23:31 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2014-09-27 11:23:39 +0200 |
commit | 776268d077f8e7174b61f015b98d6c71ea43db0b (patch) | |
tree | e3eeb7bceed88f651af93b7a0e25bd34c609e0a7 | |
parent | 578c0b4318a3a557a94098bf4bde0375012ae761 (diff) |
expedite: fix to follow the new eo_add semantics.devs/cedric/efl-1.12
Summary:
Please see EFL's commit a7560dbc61953c3652780f232e38adbd2d711972 for
more information.
@fix
Reviewers: cedric, tasn
Subscribers: felipealmeida
Differential Revision: https://phab.enlightenment.org/D1494
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r-- | src/bin/ui.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/bin/ui.c b/src/bin/ui.c index bffc831..9f2402b 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c | |||
@@ -361,7 +361,6 @@ _ui_menu_item_full_add(Eina_Bool test, | |||
361 | 361 | ||
362 | mi = malloc(sizeof(Menu_Item)); | 362 | mi = malloc(sizeof(Menu_Item)); |
363 | mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); | 363 | mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); |
364 | eo_unref(mi->o_icon); | ||
365 | eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL), | 364 | eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL), |
366 | evas_obj_size_set(32, 32), | 365 | evas_obj_size_set(32, 32), |
367 | evas_obj_image_fill_set(0, 0, 32, 32)); | 366 | evas_obj_image_fill_set(0, 0, 32, 32)); |
@@ -391,7 +390,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
391 | win_h = ui_h; | 390 | win_h = ui_h; |
392 | 391 | ||
393 | o = eo_add(EVAS_RECTANGLE_CLASS, evas); | 392 | o = eo_add(EVAS_RECTANGLE_CLASS, evas); |
394 | eo_unref(o); | ||
395 | eo_do(o, evas_obj_position_set(0, 0), | 393 | eo_do(o, evas_obj_position_set(0, 0), |
396 | evas_obj_size_set(win_w, win_h), | 394 | evas_obj_size_set(win_w, win_h), |
397 | evas_obj_color_set(0, 0, 0, 0), | 395 | evas_obj_color_set(0, 0, 0, 0), |
@@ -402,7 +400,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
402 | o_bg = o; | 400 | o_bg = o; |
403 | 401 | ||
404 | o = eo_add(EVAS_RECTANGLE_CLASS, evas); | 402 | o = eo_add(EVAS_RECTANGLE_CLASS, evas); |
405 | eo_unref(o); | ||
406 | eo_do(o, evas_obj_position_set(0, 0), | 403 | eo_do(o, evas_obj_position_set(0, 0), |
407 | evas_obj_size_set(win_w, win_h), | 404 | evas_obj_size_set(win_w, win_h), |
408 | evas_obj_color_set(255, 255, 255, 255), | 405 | evas_obj_color_set(255, 255, 255, 255), |
@@ -411,7 +408,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
411 | o_wallpaper = o; | 408 | o_wallpaper = o; |
412 | 409 | ||
413 | o = eo_add(EVAS_TEXT_CLASS, evas); | 410 | o = eo_add(EVAS_TEXT_CLASS, evas); |
414 | eo_unref(o); | ||
415 | eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), | 411 | eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), |
416 | efl_text_set("EXPEDITE"), | 412 | efl_text_set("EXPEDITE"), |
417 | evas_obj_layer_set(100), | 413 | evas_obj_layer_set(100), |
@@ -425,7 +421,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
425 | o_title = o; | 421 | o_title = o; |
426 | 422 | ||
427 | o = eo_add(EVAS_TEXT_CLASS, evas); | 423 | o = eo_add(EVAS_TEXT_CLASS, evas); |
428 | eo_unref(o); | ||
429 | eo_do(o, efl_text_properties_font_set("Vera", 9), | 424 | eo_do(o, efl_text_properties_font_set("Vera", 9), |
430 | efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), | 425 | efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), |
431 | evas_obj_layer_set(100), | 426 | evas_obj_layer_set(100), |
@@ -439,7 +434,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
439 | o_byline = o; | 434 | o_byline = o; |
440 | 435 | ||
441 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 436 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
442 | eo_unref(o); | ||
443 | eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), | 437 | eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), |
444 | efl_file_set(build_path("e-logo.png"), NULL), | 438 | efl_file_set(build_path("e-logo.png"), NULL), |
445 | evas_obj_image_fill_set(0, 0, 120, 160), | 439 | evas_obj_image_fill_set(0, 0, 120, 160), |
@@ -450,7 +444,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
450 | o_menu_logo = o; | 444 | o_menu_logo = o; |
451 | 445 | ||
452 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 446 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
453 | eo_unref(o); | ||
454 | eo_do(o, evas_obj_position_set(win_w - 128, - 128), | 447 | eo_do(o, evas_obj_position_set(win_w - 128, - 128), |
455 | evas_obj_image_fill_set(0, 0, 256, 256), | 448 | evas_obj_image_fill_set(0, 0, 256, 256), |
456 | evas_obj_size_set(256, 256), | 449 | evas_obj_size_set(256, 256), |
@@ -458,7 +451,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
458 | o_menu_icon = o; | 451 | o_menu_icon = o; |
459 | 452 | ||
460 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 453 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
461 | eo_unref(o); | ||
462 | eo_do(o, evas_obj_position_set(0, 0), | 454 | eo_do(o, evas_obj_position_set(0, 0), |
463 | efl_file_set(build_path("icon_sel.png"), NULL), | 455 | efl_file_set(build_path("icon_sel.png"), NULL), |
464 | evas_obj_size_set(48, 48), | 456 | evas_obj_size_set(48, 48), |
@@ -466,7 +458,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
466 | o_menu_icon_sel = o; | 458 | o_menu_icon_sel = o; |
467 | 459 | ||
468 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 460 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
469 | eo_unref(o); | ||
470 | eo_do(o, evas_obj_position_set(0, 0), | 461 | eo_do(o, evas_obj_position_set(0, 0), |
471 | efl_file_set(build_path("text_sel.png"), NULL), | 462 | efl_file_set(build_path("text_sel.png"), NULL), |
472 | evas_obj_size_set(96, 32), | 463 | evas_obj_size_set(96, 32), |
@@ -475,7 +466,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
475 | o_menu_text_sel = o; | 466 | o_menu_text_sel = o; |
476 | 467 | ||
477 | o = eo_add(EVAS_TEXT_CLASS, evas); | 468 | o = eo_add(EVAS_TEXT_CLASS, evas); |
478 | eo_unref(o); | ||
479 | eo_do(o, efl_text_properties_font_set("Vera", 10), | 469 | eo_do(o, efl_text_properties_font_set("Vera", 10), |
480 | efl_text_set(""), | 470 | efl_text_set(""), |
481 | evas_obj_color_set(0, 0, 0, 100), | 471 | evas_obj_color_set(0, 0, 0, 100), |