From f11ad7850ad291caf82514a7fde664c56d8989ae Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Sat, 8 Dec 2012 18:39:24 +0000 Subject: [PATCH] elm: fixed build break caused by my two commits. SVN revision: 80533 --- legacy/elementary/src/lib/elc_naviframe.c | 3 +-- legacy/elementary/src/lib/elm_widget_box.h | 2 +- legacy/elementary/src/lib/elm_widget_panel.h | 2 +- legacy/elementary/src/lib/elm_widget_prefs.h | 2 +- legacy/elementary/src/lib/elm_widget_toolbar.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 6ee0b6a0dc..de1cf7ad20 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -1284,7 +1284,6 @@ static void _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { Elm_Naviframe_Item *it; - Eina_List *l; Elm_Naviframe_Smart_Data *sd = _pd; @@ -1297,7 +1296,7 @@ _elm_naviframe_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED) } //All popping items which are not called yet by animator. - EINA_LIST_FREE(sd->popping, l, it) + EINA_LIST_FREE(sd->popping, it) { if (it->animator) ecore_animator_del(it->animator); elm_widget_item_del(it); diff --git a/legacy/elementary/src/lib/elm_widget_box.h b/legacy/elementary/src/lib/elm_widget_box.h index f83b6fbfab..a8993b00ec 100644 --- a/legacy/elementary/src/lib/elm_widget_box.h +++ b/legacy/elementary/src/lib/elm_widget_box.h @@ -21,7 +21,7 @@ typedef struct _Elm_Box_Smart_Data Elm_Box_Smart_Data; struct _Elm_Box_Smart_Data { Eina_Bool homogeneous : 1; - Eina_Bool on_deletion : 1; + Eina_Bool delete_me : 1; Eina_Bool horizontal : 1; Eina_Bool recalc : 1; }; diff --git a/legacy/elementary/src/lib/elm_widget_panel.h b/legacy/elementary/src/lib/elm_widget_panel.h index 2b835bce8e..ed91348709 100644 --- a/legacy/elementary/src/lib/elm_widget_panel.h +++ b/legacy/elementary/src/lib/elm_widget_panel.h @@ -26,7 +26,7 @@ struct _Elm_Panel_Smart_Data Elm_Panel_Orient orient; Eina_Bool hidden : 1; - Eina_Bool on_deletion : 1; + Eina_Bool delete_me : 1; }; /** diff --git a/legacy/elementary/src/lib/elm_widget_prefs.h b/legacy/elementary/src/lib/elm_widget_prefs.h index a62e39a6a9..8150df737d 100644 --- a/legacy/elementary/src/lib/elm_widget_prefs.h +++ b/legacy/elementary/src/lib/elm_widget_prefs.h @@ -77,7 +77,7 @@ struct _Elm_Prefs_Smart_Data Eina_Bool changing_from_ui : 1; Eina_Bool values_fetching : 1; - Eina_Bool on_deletion : 1; + Eina_Bool delete_me : 1; Eina_Bool autosave : 1; Eina_Bool dirty : 1; }; diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/legacy/elementary/src/lib/elm_widget_toolbar.h index d453fa2b7d..f9d0ffaa45 100644 --- a/legacy/elementary/src/lib/elm_widget_toolbar.h +++ b/legacy/elementary/src/lib/elm_widget_toolbar.h @@ -45,7 +45,7 @@ struct _Elm_Toolbar_Smart_Data Eina_Bool vertical : 1; Eina_Bool long_press : 1; Eina_Bool homogeneous : 1; - Eina_Bool on_deletion : 1; + Eina_Bool delete_me : 1; Eina_Bool reorder_mode : 1; Eina_Bool transverse_expanded : 1; };