From 86d5c41583f9a0c781f238f7bf0045b2dedd52f0 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Wed, 21 Apr 2010 07:46:03 +0000
Subject: [PATCH]  * remove shadow declarations  * missing initializer in
 Evas_Smart_Class (the data field was missing)

SVN revision: 48197
---
 legacy/elementary/src/lib/elm_widget.c   |  1 +
 legacy/elementary/src/lib/elm_win.c      | 18 +++++++++---------
 legacy/elementary/src/lib/els_icon.c     |  1 +
 legacy/elementary/src/lib/els_pan.c      |  5 +++--
 legacy/elementary/src/lib/els_scroller.c |  1 +
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index 98d73c3c6e..cc1d999edf 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -1458,6 +1458,7 @@ _smart_init(void)
 	       NULL,
 	       NULL,
                NULL,
+               NULL,
                NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 464618e3f6..8e1c2d426e 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -395,13 +395,13 @@ _elm_win_client_message(void *data, int type __UNUSED__, void *event)
      {
         if (e->data.l[0] == win->xwin)
           {
-             Evas *e = evas_object_evas_get(win->win_obj);
-             if (e)
+             Evas *evas = evas_object_evas_get(win->win_obj);
+             if (evas)
                {
                   edje_file_cache_flush();
                   edje_collection_cache_flush();
-                  evas_image_cache_flush(e);
-                  evas_font_cache_flush(e);
+                  evas_image_cache_flush(evas);
+                  evas_font_cache_flush(evas);
                }
           }
      }
@@ -409,14 +409,14 @@ _elm_win_client_message(void *data, int type __UNUSED__, void *event)
      {
         if (e->data.l[0] == win->xwin)
           {
-             Evas *e = evas_object_evas_get(win->win_obj);
-             if (e)
+             Evas *evas = evas_object_evas_get(win->win_obj);
+             if (evas)
                {
                   edje_file_cache_flush();
                   edje_collection_cache_flush();
-                  evas_image_cache_flush(e);
-                  evas_font_cache_flush(e);
-                  evas_render_dump(e);
+                  evas_image_cache_flush(evas);
+                  evas_font_cache_flush(evas);
+                  evas_render_dump(evas);
                }
           }
      }
diff --git a/legacy/elementary/src/lib/els_icon.c b/legacy/elementary/src/lib/els_icon.c
index 3a870e9c7f..371b16bbd5 100644
--- a/legacy/elementary/src/lib/els_icon.c
+++ b/legacy/elementary/src/lib/els_icon.c
@@ -351,6 +351,7 @@ _smart_init(void)
 	       NULL,
 	       NULL,
                NULL,
+               NULL,
                NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/legacy/elementary/src/lib/els_pan.c b/legacy/elementary/src/lib/els_pan.c
index 0e42abb361..f1982fc717 100644
--- a/legacy/elementary/src/lib/els_pan.c
+++ b/legacy/elementary/src/lib/els_pan.c
@@ -265,8 +265,9 @@ _smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
-               NULL,
-               NULL
+	       NULL,
+	       NULL,
+	       NULL
 	  };
 	_smart = evas_smart_class_new(&sc);
      }
diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c
index 8542edc453..a781c5eb89 100644
--- a/legacy/elementary/src/lib/els_scroller.c
+++ b/legacy/elementary/src/lib/els_scroller.c
@@ -2162,6 +2162,7 @@ _smart_init(void)
 	       NULL,
 	       NULL,
                NULL,
+               NULL,
                NULL
 	  };
 	_smart = evas_smart_class_new(&sc);