E SVN: kiwi trunk/e/src/modules/conf_desks

[Enlightenment S. <no-...@en...>]

Log:
  avoids overriding some advanced pannel values when changing something in basic pannel. for example, when you add one desktop, it was reseting the flip animate time.
  also it only checks basic values in basic pannel apply.
  and keeps coherency when you apply advanced pannel and goes back to basic.
  
  ok barbieri
  
Author:       kiwi
Date:         2009-12-28 00:23:41 -0800 (Mon, 28 Dec 2009)
New Revision: 44747

Modified:
  trunk/e/src/modules/conf_desks/e_int_config_desks.c 

Modified: trunk/e/src/modules/conf_desks/e_int_config_desks.c
===================================================================
--- trunk/e/src/modules/conf_desks/e_int_config_desks.c	2009-12-28 08:19:52 UTC (rev 44746)
+++ trunk/e/src/modules/conf_desks/e_int_config_desks.c	2009-12-28 08:23:41 UTC (rev 44747)
@@ -122,10 +122,8 @@
      {
 	cfdata->flip_mode = 1;
 	e_config->desk_flip_animate_mode = 1;
-	e_config->desk_flip_animate_interpolation = 0;
-	e_config->desk_flip_animate_time  = 0.5;
      }
-   else
+   if (!cfdata->flip_animate)
      {
 	cfdata->flip_mode = 0;
 	e_config->desk_flip_animate_mode = 0;
@@ -153,20 +151,9 @@
 	      return 1;
 	 }
 
-   if (cfdata->flip_animate)
-     {
-	if ((cfdata->flip_mode != 1) ||
-	    (e_config->desk_flip_animate_mode != 1) ||
-	    (e_config->desk_flip_animate_interpolation != 0) ||
-	    (e_config->desk_flip_animate_time != 0.5))
-	  return 1;
-     }
-   else
-     {
-	if ((cfdata->flip_mode != 0) ||
-	    (e_config->desk_flip_animate_mode != 0))
-	  return 1;
-     }
+   if ( (cfdata->flip_animate && (e_config->desk_flip_animate_mode == 0)) ||
+       (!cfdata->flip_animate && (e_config->desk_flip_animate_mode != 0)) )
+      return 1;
 
    return 0;
 }
@@ -185,6 +172,8 @@
        EINA_LIST_FOREACH(con->zones, lll, zone)
          e_zone_desk_count_set(zone, cfdata->x, cfdata->y);
 
+   cfdata->flip_animate = cfdata->flip_mode > 0;
+
    e_config->desk_flip_animate_mode = cfdata->flip_mode;
    e_config->desk_flip_animate_interpolation = cfdata->flip_interp;
    e_config->desk_flip_pan_bg = cfdata->flip_pan_bg;