E CVS: deskshow urandom

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

Enlightenment CVS committal

Author  : urandom
Project : e_modules
Module  : deskshow

Dir     : e_modules/deskshow


Modified Files:
	e_mod_main.c 


Log Message:
reflect e's changes

===================================================================
RCS file: /cvs/e/e_modules/deskshow/e_mod_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.c	20 Jul 2006 22:22:48 -0000	1.7
+++ e_mod_main.c	21 Jul 2006 00:48:13 -0000	1.8
@@ -115,11 +115,13 @@
       E_Border *bd;
       E_Border_List *bl;
       E_Zone *zone;
+      E_Desk *desk;
 
       zone = e_util_zone_current_get (e_manager_current_get ());
       if (zone)
 	{
-	   if (zone->deskshow_toggle)
+	   desk = e_desk_current_get(zone);
+	   if (desk->deskshow_toggle)
 	     edje_object_signal_emit(inst->o_button, "passive", "");
 	   else
 	     edje_object_signal_emit(inst->o_button, "active", "");
@@ -127,9 +129,9 @@
 	  bl = e_container_border_list_first (zone->container);
 	  while ((bd = e_container_border_list_next (bl)))
 	    {
-	      if (bd->desk == e_desk_current_get (bd->zone))
+	      if (bd->desk == desk)
 		{
-		  if (zone->deskshow_toggle)
+		  if (desk->deskshow_toggle)
 		    {
 		      if (bd->deskshow)
 			e_border_uniconify (bd);
@@ -148,7 +150,7 @@
 		    }
 		}
 	    }
-	  zone->deskshow_toggle = zone->deskshow_toggle ? 0 : 1;
+	  desk->deskshow_toggle = desk->deskshow_toggle ? 0 : 1;
 	  e_container_border_list_free (bl);
 	}