Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ewins.c session.c 


Log Message:
Fix a number of segv's.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- ewins.c     29 May 2005 14:59:16 -0000      1.69
+++ ewins.c     29 May 2005 23:48:08 -0000      1.70
@@ -877,9 +877,15 @@
 
    if (Mode.place.doing_slide)
      {
+#if 0                          /* No event processing during slides - No use 
doing this here */
        DrawEwinShape(ewin, Conf.slidemode, ewin->shape_x, ewin->shape_y,
                      ewin->client.w, ewin->client.h, 2);
+#endif
+#if 0                          /* FIXME - Do this right */
+       RemoveTimerEvent("Slide");
        Mode.place.doing_slide = 0;
+       FocusEnable(1);
+#endif
      }
 
    if (ewin == GetContextEwin())
@@ -891,8 +897,7 @@
 {
    /* The frame has been unmapped */
 
-   if (ewin == Mode.focuswin)
-      FocusToEWin(ewin, FOCUS_EWIN_GONE);
+   FocusToEWin(ewin, FOCUS_EWIN_GONE);
    if (ewin == Mode.mouse_over_ewin)
       Mode.mouse_over_ewin = NULL;
    if (ewin == Mode.context_ewin)
@@ -1528,8 +1533,15 @@
 {
    EWin               *ewin = data;
 
+   /* May be gone */
+   if (!FindItem((char *)ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
+      goto done;
+
    SlideEwinTo(ewin, EoGetX(ewin), EoGetY(ewin), ewin->req_x, ewin->req_y,
               Conf.slidespeedmap);
+
+ done:
+   Mode.place.doing_slide = 0;
    FocusEnable(1);
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- session.c   7 May 2005 11:19:59 -0000       1.99
+++ session.c   29 May 2005 23:48:08 -0000      1.100
@@ -841,9 +841,10 @@
        XSelectInput(disp, VRoot.win, 0);
        ExtInitWinKill();
        ESync();
-     }
 
-   ModulesSignal(ESIGNAL_EXIT, NULL);
+       /* Forget about cleaning up if no disp */
+       ModulesSignal(ESIGNAL_EXIT, NULL);
+     }
 
    ss = NULL;
    switch (mode)




-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to