elm: fixed build break caused by my two commits.

SVN revision: 80533

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 6ee0b6a..de1cf7a 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/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/src/lib/elm_widget_box.h b/src/lib/elm_widget_box.h
index f83b6fb..a8993b0 100644 (file)
--- a/src/lib/elm_widget_box.h
+++ b/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/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h
index 2b835bc..ed91348 100644 (file)
--- a/src/lib/elm_widget_panel.h
+++ b/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/src/lib/elm_widget_prefs.h b/src/lib/elm_widget_prefs.h
index a62e39a..8150df7 100644 (file)
--- a/src/lib/elm_widget_prefs.h
+++ b/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/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index d453fa2..f9d0ffa 100644 (file)
--- a/src/lib/elm_widget_toolbar.h
+++ b/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;
 };