E CVS: libs/ecore codewarrior

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : codewarrior
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore/src/lib/ecore_evas


Modified Files:
	ecore_evas_x.c 


Log Message:
initialize to 0, set prop.sticky properly

===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- ecore_evas_x.c	29 Jul 2006 09:54:20 -0000	1.84
+++ ecore_evas_x.c	29 Jul 2006 14:50:18 -0000	1.85
@@ -574,7 +574,7 @@
 		     case ECORE_X_WINDOW_STATE_MODAL:
 		        ee->engine.x.state.modal = 1;
 		        break;
-		     case ECORE_X_WINDOW_STATE_STICKY:
+		     case ECORE_X_WINDOW_STATE_STICKY:		       
 		        if (ee->prop.sticky && ee->engine.x.state.sticky)
 			  break;
 		       
@@ -1841,7 +1841,11 @@
    if ((ee->prop.sticky && sticky) ||
       (!ee->prop.sticky && !sticky)) return;
 
-   ee->prop.sticky = sticky;
+   /* We dont want to set prop.sticky here as it will cause
+    * the sticky callback not to get called. Its set on the
+    * property change event.
+    * ee->prop.sticky = sticky;
+    */   
    ee->engine.x.state.sticky = sticky;
    if (ee->should_be_visible)
      ecore_x_netwm_state_request_send(ee->engine.x.win, ee->engine.x.win_root,
@@ -2157,6 +2161,8 @@
    ee->prop.max.h = 32767;
    ee->prop.layer = 4;
    ee->prop.request_pos = 0;
+   ee->prop.sticky = 0;
+   ee->engine.x.state.sticky = 0;
    
    /* init evas here */
    ee->evas = evas_new();
@@ -2410,6 +2416,8 @@
    ee->prop.max.h = 32767;
    ee->prop.layer = 4;
    ee->prop.request_pos = 0;
+   ee->prop.sticky = 0;
+   ee->engine.x.state.sticky = 0;   
    
    /* init evas here */
    ee->evas = evas_new();
@@ -2564,6 +2572,8 @@
    ee->prop.max.h = 32767;
    ee->prop.layer = 4;
    ee->prop.request_pos = 0;
+   ee->prop.sticky = 0;
+   ee->engine.x.state.sticky = 0;   
    
    /* init evas here */
    ee->evas = evas_new();