From e7c6ae29aa88a8fe1dee4e0a7f05c3b239b8de77 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Mon, 15 Jan 2007 17:19:44 +0000
Subject: [PATCH] Use e_free for things created by e_new.

SVN revision: 28003
---
 src/bin/e_int_config_display.c | 6 +-----
 src/bin/e_int_config_exebuf.c  | 7 ++-----
 src/bin/e_int_config_focus.c   | 2 +-
 src/bin/e_int_config_fonts.c   | 9 +++------
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/bin/e_int_config_display.c b/src/bin/e_int_config_display.c
index 973252ad2..6c7e14c3a 100644
--- a/src/bin/e_int_config_display.c
+++ b/src/bin/e_int_config_display.c
@@ -308,8 +308,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	E_FREE(r);
      }
    cfdata->resolutions = evas_list_free(cfdata->resolutions);
-
-   free(cfdata);
+   E_FREE(cfdata);
 }
 
 static int
@@ -453,7 +452,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 	cfdata->resolutions = evas_list_sort(cfdata->resolutions, 
 	      evas_list_count(cfdata->resolutions), _sort_resolutions);
 
-
 	evas_event_freeze(evas_object_evas_get(ol));
 	edje_freeze();
 	e_widget_ilist_freeze(ol);
@@ -486,8 +484,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_ilist_thaw(ol);
    edje_thaw();
    evas_event_thaw(evas_object_evas_get(ol));
-
-//   e_widget_ilist_go(rl);
    
    if (cfdata->can_rotate)
      {
diff --git a/src/bin/e_int_config_exebuf.c b/src/bin/e_int_config_exebuf.c
index 1f146fe69..a93191f66 100644
--- a/src/bin/e_int_config_exebuf.c
+++ b/src/bin/e_int_config_exebuf.c
@@ -86,7 +86,7 @@ static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    E_FREE(cfdata->term_cmd);
-   free(cfdata);
+   E_FREE(cfdata);
 }
 
 static int
@@ -147,11 +147,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      evas_stringshare_del(e_config->exebuf_term_cmd);
    e_config->exebuf_term_cmd = NULL;
    if (cfdata->term_cmd) 
-     {
-	  e_config->exebuf_term_cmd = evas_stringshare_add(cfdata->term_cmd);
-     }
+     e_config->exebuf_term_cmd = evas_stringshare_add(cfdata->term_cmd);
    e_config_save_queue();
-
    return 1;
 }
 
diff --git a/src/bin/e_int_config_focus.c b/src/bin/e_int_config_focus.c
index 26477d0a8..120093c74 100644
--- a/src/bin/e_int_config_focus.c
+++ b/src/bin/e_int_config_focus.c
@@ -85,7 +85,7 @@ static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
-   free(cfdata);
+   E_FREE(cfdata);
 }
 
 /**--APPLY--**/
diff --git a/src/bin/e_int_config_fonts.c b/src/bin/e_int_config_fonts.c
index 69ae11343..b1e1df315 100644
--- a/src/bin/e_int_config_fonts.c
+++ b/src/bin/e_int_config_fonts.c
@@ -3,9 +3,6 @@
  */
 #include "e.h"
 
-#define ILIST_ICON_WITH_DEFINED_FONT	"enlightenment/e"
-#define ILIST_ICON_WITHOUT_DEFINED_FONT ""
-
 typedef struct _E_Text_Class_Pair E_Text_Class_Pair;
 typedef struct _CFText_Class CFText_Class;
 
@@ -238,7 +235,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      }
    
    E_FREE(cfdata->cur_font);
-   free(cfdata);
+   E_FREE(cfdata);
 }
 
 static int
@@ -536,7 +533,7 @@ _fill_ilist(E_Config_Dialog_Data *cfdata)
 		  if (tc->enabled)
 		    {
 		       ic = edje_object_add(evas);
-		       e_util_edje_icon_set(ic, ILIST_ICON_WITH_DEFINED_FONT);
+		       e_util_edje_icon_set(ic, "enlightenment/e");
 		    }
 		  else
 		    ic = NULL;
@@ -642,7 +639,7 @@ _enabled_font_cb_change(void *data, Evas_Object *obj)
 	if (cfdata->cur_enabled) 
 	  {
 	     icon = edje_object_add(cfdata->evas);
-	     e_util_edje_icon_set(icon, ILIST_ICON_WITH_DEFINED_FONT);
+	     e_util_edje_icon_set(icon, "enlightenment/e");
 	  }
 	e_widget_ilist_nth_icon_set(cfdata->gui.class_list, n, icon);
      }