Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        dialog.c dialog.h settings.c 


Log Message:
Fix memory leaks in combined dialog.

===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -3 -r1.171 -r1.172
--- dialog.c    22 Aug 2006 19:23:36 -0000      1.171
+++ dialog.c    6 Sep 2006 20:52:52 -0000       1.172
@@ -322,6 +322,13 @@
 }
 
 void
+DialogCallExitFunction(Dialog * d)
+{
+   if (d->exit_func)
+      d->exit_func(d, d->exit_val, NULL);
+}
+
+void
 DialogSetData(Dialog * d, void *data)
 {
    d->data = data;
@@ -630,8 +637,7 @@
    if (!d)
       return;
 
-   if (d->exit_func)
-      d->exit_func(d, d->exit_val, NULL);
+   DialogCallExitFunction(d);
 
    EwinHide(d->ewin);
 }
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- dialog.h    22 Aug 2006 19:23:36 -0000      1.18
+++ dialog.h    6 Sep 2006 20:52:52 -0000       1.19
@@ -80,6 +80,7 @@
 void                DialogSetTitle(Dialog * d, const char *title);
 void                DialogSetExitFunction(Dialog * d, DialogCallbackFunc * 
func,
                                          int val);
+void                DialogCallExitFunction(Dialog * d);
 void                DialogSetData(Dialog * d, void *data);
 void               *DialogGetData(Dialog * d);
 
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -3 -r1.158 -r1.159
--- settings.c  23 Aug 2006 21:04:53 -0000      1.158
+++ settings.c  6 Sep 2006 20:52:52 -0000       1.159
@@ -656,6 +656,8 @@
    if (!dd->fill)
       return;
 
+   DialogCallExitFunction(d);
+
    DialogItemTableEmpty(table);
    DialogKeybindingsDestroy(d);
 



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to