Enlightenment CVS committal
Author : raster
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
atoms.c config.c dialog.c evhandlers.c menus.c setup.c theme.c
Log Message:
hiroaki yoshida's leakage patch
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/atoms.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- atoms.c 22 May 2003 19:14:58 -0000 1.11
+++ atoms.c 8 Jul 2003 02:32:39 -0000 1.12
@@ -71,6 +71,8 @@
XFree(retval);
EDBUG_RETURN(data);
}
+ if (retval)
+ XFree(retval);
EDBUG_RETURN(NULL);
}
@@ -107,6 +109,8 @@
(disp, win, atom, 0, 1, False, atom, &type_ret, &fmt_ret, &nitems_ret,
&bytes_after_ret, (unsigned char **)&data) != Success || !data)
{
+ if (data)
+ XFree(data);
EDBUG_RETURN(NULL);
}
if (atom != AnyPropertyType && atom != type_ret)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- config.c 22 May 2003 19:14:58 -0000 1.58
+++ config.c 8 Jul 2003 02:32:39 -0000 1.59
@@ -3364,6 +3364,8 @@
if (!ppfile)
{
+ if (file)
+ Efree(file);
if (notheme)
file = FindNoThemeFile(f);
else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- dialog.c 22 May 2003 19:14:59 -0000 1.60
+++ dialog.c 8 Jul 2003 02:32:39 -0000 1.61
@@ -1748,9 +1748,9 @@
void
DialogItemRadioButtonSetText(DItem * di, char *text)
{
- if (di->item.check_button.text)
- Efree(di->item.check_button.text);
- di->item.check_button.text = duplicate(text);
+ if (di->item.radio_button.text)
+ Efree(di->item.radio_button.text);
+ di->item.radio_button.text = duplicate(text);
}
void
@@ -1920,12 +1920,12 @@
switch (di->type)
{
case DITEM_BUTTON:
- if (di->item.text.text)
- Efree(di->item.text.text);
+ if (di->item.button.text)
+ Efree(di->item.button.text);
break;
case DITEM_CHECKBUTTON:
- if (di->item.text.text)
- Efree(di->item.text.text);
+ if (di->item.check_button.text)
+ Efree(di->item.check_button.text);
break;
case DITEM_TEXT:
if (di->item.text.text)
@@ -1934,6 +1934,10 @@
case DITEM_IMAGE:
if (di->item.image.image)
Efree(di->item.image.image);
+ break;
+ case DITEM_RADIOBUTTON:
+ if (di->item.radio_button.text)
+ Efree(di->item.radio_button.text);
break;
case DITEM_SLIDER:
if (di->item.slider.ic_base)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- evhandlers.c 21 Jun 2003 10:39:20 -0000 1.110
+++ evhandlers.c 8 Jul 2003 02:32:40 -0000 1.111
@@ -958,6 +958,8 @@
MoveEwin(gwins[i], x, y);
}
}
+ if (gwins)
+ Efree(gwins);
}
}
/* dialogs? */
@@ -1940,6 +1942,9 @@
gwin_py[i] = gwins[i]->y;
}
+ if (gwins)
+ Efree(gwins);
+
if (ev->xbutton.window == p->hi_win)
{
int hx, hy;
@@ -2463,9 +2468,6 @@
int wx, wy, base_x = 0, base_y = 0;
Window dw;
- gwins =
- ListWinGroupMembersForEwin(p->hi_ewin, ACTION_MOVE,
- mode.nogroup, &num);
pp = ewin->pager;
cx = desks.desk[pp->desktop].current_area_x;
cy = desks.desk[pp->desktop].current_area_y;
@@ -2523,6 +2525,8 @@
((root.h * ay) + wy +
(gwin_py[i] - base_y)) % root.h);
}
+ if (gwins)
+ Efree(gwins);
}
}
else if ((ewin) && (ewin->ibox)
@@ -2571,6 +2575,8 @@
ICCCM_Iconify(gwins[i]);
}
}
+ if (gwins)
+ Efree(gwins);
}
else
{
@@ -2609,6 +2615,8 @@
if (!gwins[i]->sticky)
MoveEwinToDesktop(gwins[i], ndesk);
}
+ if (gwins)
+ Efree(gwins);
}
}
else if ((ev->xbutton.x >= 0) && (ev->xbutton.y >= 0)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- menus.c 22 May 2003 19:15:02 -0000 1.84
+++ menus.c 8 Jul 2003 02:32:40 -0000 1.85
@@ -567,6 +567,8 @@
RemoveItem((char *)m, m->win, LIST_FINDBY_POINTER, LIST_TYPE_MENU);
if (m->name)
Efree(m->name);
+ if (m->title)
+ Efree(m->title);
for (i = 0; i < m->num; i++)
{
@@ -1551,10 +1553,6 @@
mi = CreateMenuItem(txt, icc, ACTION_EXEC, params,
NULL);
AddItemToMenu(m, mi);
- if (txt)
- Efree(txt);
- if (params)
- Efree(params);
}
}
else if ((act) && (!strcmp(act, "menu")) && (params))
@@ -1569,20 +1567,18 @@
mi = CreateMenuItem(txt, icc, 0, NULL, mm);
AddItemToMenu(m, mi);
}
- if (txt)
- Efree(txt);
}
else
{
mi = CreateMenuItem(txt, icc, 0, NULL, NULL);
AddItemToMenu(m, mi);
- if (txt)
- Efree(txt);
- if (params)
- Efree(params);
}
+ if (txt)
+ Efree(txt);
if (act)
Efree(act);
+ if (params)
+ Efree(params);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- setup.c 8 Jun 2003 13:13:58 -0000 1.85
+++ setup.c 8 Jul 2003 02:32:40 -0000 1.86
@@ -446,7 +446,7 @@
mask_mod_combos[7] = LockMask | numlock_mask | scrollock_mask;
if (mod)
- XFree(mod);
+ XFreeModifiermap(mod);
}
/* Now we're going to set a bunch of default settings in E - in case we
* don't ever get to load a config file for some odd reason.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/theme.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- theme.c 22 May 2003 19:15:03 -0000 1.24
+++ theme.c 8 Jul 2003 02:32:40 -0000 1.25
@@ -131,6 +131,10 @@
def = def2;
else if ((!def) && (!def2))
fprintf(stderr, "errrrrrrrr no default theme?\n");
+
+ if (def)
+ Efree(def);
+
*number = count;
return list;
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs