E CVS: apps/e devilhorns

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

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_int_border_menu.c 


Log Message:
Move "Close" away from the bottom of the menu. Placed below "Kill" now.
This removes a "Cleanups" item from todo.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_int_border_menu.c	20 Jul 2006 11:41:12 -0000	1.35
+++ e_int_border_menu.c	25 Jul 2006 02:37:33 -0000	1.36
@@ -292,10 +292,22 @@
 				  (char *)e_theme_edje_file_get("base/theme/borders",
 								"widgets/border/default/kill"),
 				  "widgets/border/default/kill");
+     }
+
+   if (!bd->lock_close)
+     {
 	mi = e_menu_item_new(m);
-	e_menu_item_separator_set(mi, 1);
+	e_menu_item_label_set(mi, _("Close"));
+	e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd);
+	e_menu_item_icon_edje_set(mi, 
+				  (char *)e_theme_edje_file_get("base/theme/borders",
+								"widgets/border/default/close"), 
+				  "widgets/border/default/close");
      }
 
+   mi = e_menu_item_new(m);
+   e_menu_item_separator_set(mi, 1);
+   
    /* Only allow to change layer for windows in "normal" layers */
 
    if ((!bd->lock_user_stacking) && (!bd->internal) &&
@@ -332,17 +344,6 @@
 				  "widgets/border/default/minimize");
      }
    
-   if (!bd->lock_close)
-     {
-	mi = e_menu_item_new(m);
-	e_menu_item_label_set(mi, _("Close"));
-	e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd);
-	e_menu_item_icon_edje_set(mi, 
-				  (char *)e_theme_edje_file_get("base/theme/borders",
-								"widgets/border/default/close"), 
-				  "widgets/border/default/close");
-     }
-
    if (key)
      e_menu_activate_key(m, bd->zone, x, y, 1, 1,
 			 E_MENU_POP_DIRECTION_DOWN);