From c53fd6e2049e5ddf306226efc711ccf13e1af7f4 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Wed, 29 Jul 2009 19:31:41 +0000
Subject: [PATCH] Use E_NEW, E_FREE and EINA_LIST macros.

SVN revision: 41538
---
 src/bin/e_xinerama.c | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c
index 67fe3611a..02091b186 100644
--- a/src/bin/e_xinerama.c
+++ b/src/bin/e_xinerama.c
@@ -51,7 +51,7 @@ e_xinerama_fake_screen_add(int x, int y, int w, int h)
 {
    E_Screen *scr;
 
-   scr = calloc(1, sizeof(E_Screen));
+   scr = E_NEW(E_Screen, 1);
    scr->screen = eina_list_count(fake_screens);
    scr->escreen = scr->screen;
    scr->x = x;
@@ -65,20 +65,13 @@ e_xinerama_fake_screen_add(int x, int y, int w, int h)
 static void
 _e_xinerama_clean(void)
 {
-   while (all_screens)
-     {
-	free(all_screens->data);
-	all_screens = eina_list_remove_list(all_screens, all_screens);
-     }
-   while (chosen_screens)
-     {
-	chosen_screens = eina_list_remove_list(chosen_screens, chosen_screens);
-     }
-   while (fake_screens)
-     {
-	free(fake_screens->data);
-	fake_screens = eina_list_remove_list(fake_screens, fake_screens);
-     }
+   E_Screen *s = NULL;
+
+   EINA_LIST_FREE(all_screens, s)
+     E_FREE(s);
+   EINA_LIST_FREE(chosen_screens, s);
+   EINA_LIST_FREE(fake_screens, s)
+     E_FREE(s);
 }
 
 static void
@@ -112,7 +105,7 @@ _e_xinerama_update(void)
 	  {
 	     E_Screen *scr;
 
-	     scr = calloc(1, sizeof(E_Screen));
+	     scr = E_NEW(E_Screen, 1);
 	     scr->screen = 0;
 	     scr->x = 0;
 	     scr->y = 0;
@@ -134,7 +127,7 @@ _e_xinerama_update(void)
 		       printf("E17 INIT: XINERAMA SCREEN: [%i], %ix%i+%i+%i\n",
 			      i, w, h, x, y);
 		       /* add it to our list */
-		       scr = calloc(1, sizeof(E_Screen));
+		       scr = E_NEW(E_Screen, 1);
 		       scr->screen = i;
 		       scr->x = x;
 		       scr->y = y;