Use e_free for things created by e_new.
SVN revision: 28003
This commit is contained in:
parent
f4420e0ebb
commit
e7c6ae29aa
|
@ -308,8 +308,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
E_FREE(r);
|
E_FREE(r);
|
||||||
}
|
}
|
||||||
cfdata->resolutions = evas_list_free(cfdata->resolutions);
|
cfdata->resolutions = evas_list_free(cfdata->resolutions);
|
||||||
|
E_FREE(cfdata);
|
||||||
free(cfdata);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
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,
|
cfdata->resolutions = evas_list_sort(cfdata->resolutions,
|
||||||
evas_list_count(cfdata->resolutions), _sort_resolutions);
|
evas_list_count(cfdata->resolutions), _sort_resolutions);
|
||||||
|
|
||||||
|
|
||||||
evas_event_freeze(evas_object_evas_get(ol));
|
evas_event_freeze(evas_object_evas_get(ol));
|
||||||
edje_freeze();
|
edje_freeze();
|
||||||
e_widget_ilist_freeze(ol);
|
e_widget_ilist_freeze(ol);
|
||||||
|
@ -487,8 +485,6 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
edje_thaw();
|
edje_thaw();
|
||||||
evas_event_thaw(evas_object_evas_get(ol));
|
evas_event_thaw(evas_object_evas_get(ol));
|
||||||
|
|
||||||
// e_widget_ilist_go(rl);
|
|
||||||
|
|
||||||
if (cfdata->can_rotate)
|
if (cfdata->can_rotate)
|
||||||
{
|
{
|
||||||
of = e_widget_framelist_add(evas, _("Rotation"), 0);
|
of = e_widget_framelist_add(evas, _("Rotation"), 0);
|
||||||
|
|
|
@ -86,7 +86,7 @@ static void
|
||||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
E_FREE(cfdata->term_cmd);
|
E_FREE(cfdata->term_cmd);
|
||||||
free(cfdata);
|
E_FREE(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
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);
|
evas_stringshare_del(e_config->exebuf_term_cmd);
|
||||||
e_config->exebuf_term_cmd = NULL;
|
e_config->exebuf_term_cmd = NULL;
|
||||||
if (cfdata->term_cmd)
|
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();
|
e_config_save_queue();
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,7 @@ static void
|
||||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
/* Free the cfdata */
|
/* Free the cfdata */
|
||||||
free(cfdata);
|
E_FREE(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**--APPLY--**/
|
/**--APPLY--**/
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
*/
|
*/
|
||||||
#include "e.h"
|
#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 _E_Text_Class_Pair E_Text_Class_Pair;
|
||||||
typedef struct _CFText_Class CFText_Class;
|
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);
|
E_FREE(cfdata->cur_font);
|
||||||
free(cfdata);
|
E_FREE(cfdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -536,7 +533,7 @@ _fill_ilist(E_Config_Dialog_Data *cfdata)
|
||||||
if (tc->enabled)
|
if (tc->enabled)
|
||||||
{
|
{
|
||||||
ic = edje_object_add(evas);
|
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
|
else
|
||||||
ic = NULL;
|
ic = NULL;
|
||||||
|
@ -642,7 +639,7 @@ _enabled_font_cb_change(void *data, Evas_Object *obj)
|
||||||
if (cfdata->cur_enabled)
|
if (cfdata->cur_enabled)
|
||||||
{
|
{
|
||||||
icon = edje_object_add(cfdata->evas);
|
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);
|
e_widget_ilist_nth_icon_set(cfdata->gui.class_list, n, icon);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue