Fixes for e16.8.

SVN revision: 23867

Ganymede/data/ACTIVATE_BUTTONS

@@ -1,18 +1,18 @@
 #! /bin/sh
 
-rm -f buttons.cfg
+#rm -f buttons.cfg
 
-if test ! -d ~/.enlightenment; then
-  (mkdir ~/.enlightenment)
+if test ! -d ~/.e16; then
+  (mkdir ~/.e16)
 fi
 
-cat > ~/.enlightenment/buttons.cfg << EOF
+cat > ~/.e16/buttons.cfg << EOF
 #include <definitions>
 __E_CFG_VERSION 0
 
 #include <buttons/buttons.cfg>
 EOF
 
-cp --backup --suffix .old Pulldowns/* ~/.enlightenment
+cp --backup --suffix .old Pulldowns/* ~/.e16
 
 eesh -e restart

Ganymede/data/menustyles/menustyles.cfg

@@ -108,7 +108,6 @@ NORMAL_MENU_STYLE_VERTICAL("CONFIG",     "MENU_NOTITLE", 	"GANYMEDE_MENU", "MENU
 NORMAL_MENU_STYLE_VERTICAL("TASK_MENU",  "MENU_NOTITLE", 	"GANYMEDE_MENU", "MENU_FOCUS",   "MENUBACK",     "DEFAULT_MENU_SUB", 40)
 NORMAL_MENU_STYLE_VERTICAL("DESK_MENU",  "MENU_NOTITLE", 	"GANYMEDE_MENU", "MENU_FOCUS",   "MENUBACK",     "DEFAULT_MENU_SUB", 40)
 
-#if 0 /* Menu definitions can no longer be in menustyles.cfg */
 BEGIN_NEW_MENU("GANYMEDE_CONFIG_MENU", "CONFIG")
 ADD_MENU_TITLE("E Config")
 ADD_MENU_ICON_ITEM(CONFIG_AUDIO_TOGGLE,      __A_SOUND_SET, "" )
@@ -129,16 +128,15 @@ ADD_MENU_ICON_ITEM(DO_RESTART_BUTTON,        __A_EXIT, restart )
 ADD_MENU_ICON_ITEM(DO_EXIT_BUTTON,           __A_EXIT, "" )
 END_MENU
 
-BEGIN_NEW_FILE_MENU("GANYMEDE_TERMINALS", "EMPTY", HOME_DIR"/.enlightenment/ganymede.terminals.menu")
+BEGIN_NEW_FILE_MENU("GANYMEDE_TERMINALS", "EMPTY", HOME_DIR"/.e16/menus/ganymede.terminals.menu")
 END_MENU
-BEGIN_NEW_FILE_MENU("GANYMEDE_MAILERS", "EMPTY", HOME_DIR"/.enlightenment/ganymede.mailers.menu")
+BEGIN_NEW_FILE_MENU("GANYMEDE_MAILERS", "EMPTY", HOME_DIR"/.e16/menus/ganymede.mailers.menu")
 END_MENU
-BEGIN_NEW_FILE_MENU("GANYMEDE_EDITORS", "EMPTY", HOME_DIR"/.enlightenment/ganymede.editors.menu")
+BEGIN_NEW_FILE_MENU("GANYMEDE_EDITORS", "EMPTY", HOME_DIR"/.e16/menus/ganymede.editors.menu")
 END_MENU
-BEGIN_NEW_FILE_MENU("GANYMEDE_NET", "EMPTY", HOME_DIR"/.enlightenment/ganymede.net.menu")
+BEGIN_NEW_FILE_MENU("GANYMEDE_NET", "EMPTY", HOME_DIR"/.e16/menus/ganymede.net.menu")
 END_MENU
-BEGIN_NEW_FILE_MENU("GANYMEDE_GRAPHICS", "EMPTY", HOME_DIR"/.enlightenment/ganymede.graphics.menu")
+BEGIN_NEW_FILE_MENU("GANYMEDE_GRAPHICS", "EMPTY", HOME_DIR"/.e16/menus/ganymede.graphics.menu")
 END_MENU
-BEGIN_NEW_FILE_MENU("GANYMEDE_OTHER", "EMPTY", HOME_DIR"/.enlightenment/ganymede.other.menu")
+BEGIN_NEW_FILE_MENU("GANYMEDE_OTHER", "EMPTY", HOME_DIR"/.e16/menus/ganymede.other.menu")
 END_MENU
-#endif