Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_fwin.c e_fm.c 


Log Message:
Move adding the extra separator on menu to the function that is calling the
"menu extend" so that we don't end up with extra separators at the end of
the menu.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- e_fwin.c    25 Jul 2007 17:00:50 -0000      1.56
+++ e_fwin.c    11 Aug 2007 09:24:33 -0000      1.57
@@ -514,6 +514,9 @@
    if (e_fm2_has_parent_get(obj))
      {
        mi = e_menu_item_new(m);
+       e_menu_item_separator_set(mi, 1);
+
+       mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, _("Go to Parent Directory"));
        e_menu_item_icon_edje_set(mi,
                                  e_theme_edje_file_get("base/theme/fileman",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -3 -r1.193 -r1.194
--- e_fm.c      4 Aug 2007 13:12:41 -0000       1.193
+++ e_fm.c      11 Aug 2007 09:24:34 -0000      1.194
@@ -6214,11 +6214,7 @@
          }
             
        if (sd->icon_menu.end.func)
-         {
-            mi = e_menu_item_new(mn);
-            e_menu_item_separator_set(mi, 1);
-            sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, NULL);
-         }
+         sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, NULL);
      }
    
    man = e_manager_current_get();
@@ -6434,11 +6430,7 @@
        e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
        
        if (sd->icon_menu.end.func)
-         {
-            mi = e_menu_item_new(mn);
-            e_menu_item_separator_set(mi, 1);
-            sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, 
&(ic->info));
-         }
+         sd->icon_menu.end.func(sd->icon_menu.end.data, sd->obj, mn, 
&(ic->info));
      }
    
    man = e_manager_current_get();



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to