diff -r de05fae3311f -r 3dd43161fc0e .fvwm/xdg2fvwm.py --- a/.fvwm/xdg2fvwm.py Tue Aug 28 17:23:55 2012 +0300 +++ b/.fvwm/xdg2fvwm.py Tue Aug 28 18:24:57 2012 +0300 @@ -10,15 +10,14 @@ # For testing purpose. Uncomment to run this file without args... # sys.argv.append('debian-menu') -if len(sys.argv) >= 2: - sys_menu_name = sys.argv[1] +if len(sys.argv) >= 3: + # xdg_config_dirs hold possible paths. We use Debian one. + fvwm_menu_name = sys.argv[1] + sys_menu_file = sys.argv[2] else: - print("You forget pass NAME which is /etc/xdg/NAME.menu") + print("You forget pass NAME which is like /etc/xdg/NAME.menu") exit(1) -# xdg_config_dirs hold possible paths. We use Debian one. -sys_menu_file = "%s/menus/%s.menu" % ("/etc/xdg", sys_menu_name) - sys_menu = xdg.Menu.parse(sys_menu_file) def parse_menu(menu, name): @@ -41,5 +40,5 @@ else: pass -parse_menu(sys_menu, "Menu-"+sys_menu_name) +parse_menu(sys_menu, fvwm_menu_name)