Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        borders.c 


Log Message:
Revert bad change to Unmap handling.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- borders.c   10 Apr 2004 10:43:55 -0000      1.165
+++ borders.c   10 Apr 2004 10:47:14 -0000      1.166
@@ -1269,11 +1269,20 @@
    EDBUG_RETURN(ewin);
 }
 
+static void
+EwinRemoveFromGroups(EWin * ewin)
+{
+   int                 num, i;
+
+   num = ewin->num_groups;
+   for (i = 0; i < num; i++)
+      RemoveEwinFromGroup(ewin, ewin->groups[0]);
+}
+
 void
 EwinDestroy(EWin * ewin)
 {
    EWin               *ewin2;
-   int                 i, num_groups;
 
    EDBUG(5, "FreeEwin");
    if (!ewin)
@@ -1330,12 +1339,7 @@
       Efree(ewin->session_id);
    FreePmapMask(&ewin->mini_pmm);
    FreePmapMask(&ewin->icon_pmm);
-   if (ewin->groups)
-     {
-       num_groups = ewin->num_groups;
-       for (i = 0; i < num_groups; i++)
-          RemoveEwinFromGroup(ewin, ewin->groups[0]);
-     }
+   EwinRemoveFromGroups(ewin);
    Efree(ewin);
 
    EDBUG_RETURN_;
@@ -1385,15 +1389,16 @@
        Mode.doingslide = 0;
      }
 
-   HideEwin(ewin);
-
-   if (!ewin->internal)
-      return;
+   if (ewin->iconified)
+     {
+       HideEwin(ewin);
+       return;
+     }
 
    if (ewin->Close)
       ewin->Close(ewin);
 
-   /* Park the client window on the root so we can use it again later */
+   /* Park the client window on the root */
    XTranslateCoordinates(disp, ewin->client.win, root.win,
                         -ewin->border->border.left,
                         -ewin->border->border.top, &ewin->client.x,




-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to