Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/lib


Modified Files:
        edje_message_queue.c 


Log Message:


asparagus - pass distcheck.

===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- edje_message_queue.c        25 Mar 2007 07:10:48 -0000      1.25
+++ edje_message_queue.c        5 May 2007 15:14:16 -0000       1.26
@@ -69,6 +69,7 @@
        
        em = tmp_msgq->data;
        tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq);
+       em->edje->message.num--;
        _edje_message_process(em);
        _edje_message_free(em);
      }
@@ -251,7 +252,6 @@
             break;
          }
      }
-   em->edje->message.num--;
    free(em);
 }
 
@@ -580,7 +580,7 @@
             tmp_msgq = msgq;
             msgq = NULL;
          }
-       
+
        while (tmp_msgq)
          {
             Edje_Message *em;
@@ -588,11 +588,17 @@
             
             em = tmp_msgq->data;
             ed = em->edje;
-            ed->processing_messages++;
             tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq);
-            _edje_message_process(em);
-            _edje_message_free(em);
-            ed->processing_messages--;
+            em->edje->message.num--;
+            if (!ed->delete_me)
+              {
+                 ed->processing_messages++;
+                 _edje_message_process(em);
+                 _edje_message_free(em);
+                 ed->processing_messages--;
+              }
+            else
+              _edje_message_free(em);
             if (ed->processing_messages == 0)
               {
                  if (ed->delete_me) _edje_del(ed);
@@ -615,6 +621,7 @@
        
        em = msgq->data;
        msgq = evas_list_remove_list(msgq, msgq);
+       em->edje->message.num--;
        _edje_message_free(em);
      }
    while (tmp_msgq)
@@ -623,6 +630,7 @@
        
        em = tmp_msgq->data;
        tmp_msgq = evas_list_remove_list(tmp_msgq, tmp_msgq);
+       em->edje->message.num--;
        _edje_message_free(em);
      }
 }
@@ -645,6 +653,7 @@
        if (em->edje == ed)
          {
             msgq = evas_list_remove_list(msgq, lp);
+            em->edje->message.num--;
             _edje_message_free(em);
          }
        if (ed->message.num <= 0) return;
@@ -661,6 +670,7 @@
        if (em->edje == ed)
          {
             tmp_msgq = evas_list_remove_list(tmp_msgq, lp);
+            em->edje->message.num--;
             _edje_message_free(em);
          }
        if (ed->message.num <= 0) return;



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to