[Xfce4-commits] <xfdesktop:master> Drop the menu data, which is now in Garcon.
Nick Schermer
noreply at xfce.org
Thu Apr 29 00:00:02 CEST 2010
Updating branch refs/heads/master
to 1b1a3ce80bf25b996ddf3e828f04fad6cfed5758 (commit)
from ef92d1c7fd91fd8ba991ca0db3a642f77ba2c6a5 (commit)
commit 1b1a3ce80bf25b996ddf3e828f04fad6cfed5758
Author: Nick Schermer <nick at xfce.org>
Date: Wed Apr 28 23:40:31 2010 +0200
Drop the menu data, which is now in Garcon.
configure.ac.in | 2 -
modules/menu/Makefile.am | 4 -
modules/menu/directory-data/Makefile.am | 21 ---
.../directory-data/xfce-accessories.directory.in | 7 -
.../directory-data/xfce-development.directory.in | 7 -
.../directory-data/xfce-education.directory.in | 7 -
.../menu/directory-data/xfce-games.directory.in | 7 -
.../menu/directory-data/xfce-graphics.directory.in | 7 -
.../directory-data/xfce-multimedia.directory.in | 7 -
.../menu/directory-data/xfce-network.directory.in | 7 -
.../menu/directory-data/xfce-office.directory.in | 7 -
.../menu/directory-data/xfce-other.directory.in | 7 -
.../menu/directory-data/xfce-science.directory.in | 7 -
.../directory-data/xfce-screensavers.directory.in | 7 -
.../menu/directory-data/xfce-settings.directory.in | 7 -
.../menu/directory-data/xfce-system.directory.in | 7 -
modules/menu/menu-data/Makefile.am | 15 --
modules/menu/menu-data/xfce-applications.menu | 152 --------------------
modules/menu/menu-data/xfce4-about-xfce.desktop.in | 12 --
modules/menu/menu-data/xfce4-help.desktop.in | 12 --
modules/menu/menu-data/xfce4-logout.desktop.in | 12 --
.../menu/menu-data/xfce4-run-program.desktop.in | 12 --
po/POTFILES.in | 17 ---
23 files changed, 0 insertions(+), 350 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 45b2e35..4475d16 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -260,8 +260,6 @@ doc/ja/xfdesktop.xml
doc/ja/images/Makefile
modules/Makefile
modules/menu/Makefile
-modules/menu/directory-data/Makefile
-modules/menu/menu-data/Makefile
pixmaps/Makefile
po/Makefile.in
po-doc/Makefile
diff --git a/modules/menu/Makefile.am b/modules/menu/Makefile.am
index b8db5d5..ab509c2 100644
--- a/modules/menu/Makefile.am
+++ b/modules/menu/Makefile.am
@@ -1,7 +1,3 @@
-SUBDIRS = \
- directory-data \
- menu-data
-
plugindir = $(libdir)/xfce4/modules
plugin_LTLIBRARIES = xfce4_desktop_menu.la
diff --git a/modules/menu/directory-data/Makefile.am b/modules/menu/directory-data/Makefile.am
deleted file mode 100644
index 6db0ecb..0000000
--- a/modules/menu/directory-data/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-directorydir = $(datadir)/desktop-directories
-directory_in_files = \
- xfce-accessories.directory.in \
- xfce-development.directory.in \
- xfce-education.directory.in \
- xfce-games.directory.in \
- xfce-graphics.directory.in \
- xfce-multimedia.directory.in \
- xfce-network.directory.in \
- xfce-office.directory.in \
- xfce-other.directory.in \
- xfce-science.directory.in \
- xfce-screensavers.directory.in \
- xfce-settings.directory.in \
- xfce-system.directory.in
-directory_DATA = $(directory_in_files:.directory.in=.directory)
- at INTLTOOL_DIRECTORY_RULE@
-
-EXTRA_DIST = $(directory_in_files)
-
-DISTCLEANFILES = $(directory_DATA)
diff --git a/modules/menu/directory-data/xfce-accessories.directory.in b/modules/menu/directory-data/xfce-accessories.directory.in
deleted file mode 100644
index c42e201..0000000
--- a/modules/menu/directory-data/xfce-accessories.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-accessories
-_Name=Accessories
-_Comment=Common desktop tools and applications
diff --git a/modules/menu/directory-data/xfce-development.directory.in b/modules/menu/directory-data/xfce-development.directory.in
deleted file mode 100644
index d88bf80..0000000
--- a/modules/menu/directory-data/xfce-development.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-development
-_Name=Development
-_Comment=Software development tools
diff --git a/modules/menu/directory-data/xfce-education.directory.in b/modules/menu/directory-data/xfce-education.directory.in
deleted file mode 100644
index 4aff4ef..0000000
--- a/modules/menu/directory-data/xfce-education.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-education
-_Name=Education
-_Comment=Educational software
diff --git a/modules/menu/directory-data/xfce-games.directory.in b/modules/menu/directory-data/xfce-games.directory.in
deleted file mode 100644
index 564a41b..0000000
--- a/modules/menu/directory-data/xfce-games.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-games
-_Name=Games
-_Comment=Games, puzzles, and other fun software
diff --git a/modules/menu/directory-data/xfce-graphics.directory.in b/modules/menu/directory-data/xfce-graphics.directory.in
deleted file mode 100644
index ea75ba6..0000000
--- a/modules/menu/directory-data/xfce-graphics.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-graphics
-_Name=Graphics
-_Comment=Graphics creation and manipulation applications
diff --git a/modules/menu/directory-data/xfce-multimedia.directory.in b/modules/menu/directory-data/xfce-multimedia.directory.in
deleted file mode 100644
index a70203e..0000000
--- a/modules/menu/directory-data/xfce-multimedia.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-multimedia
-_Name=Multimedia
-_Comment=Audio and video players and editors
diff --git a/modules/menu/directory-data/xfce-network.directory.in b/modules/menu/directory-data/xfce-network.directory.in
deleted file mode 100644
index 6648181..0000000
--- a/modules/menu/directory-data/xfce-network.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-internet
-_Name=Network
-_Comment=Network applications and utilities
diff --git a/modules/menu/directory-data/xfce-office.directory.in b/modules/menu/directory-data/xfce-office.directory.in
deleted file mode 100644
index 4d70517..0000000
--- a/modules/menu/directory-data/xfce-office.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-office
-_Name=Office
-_Comment=Office and productivity applications
diff --git a/modules/menu/directory-data/xfce-other.directory.in b/modules/menu/directory-data/xfce-other.directory.in
deleted file mode 100644
index f00f240..0000000
--- a/modules/menu/directory-data/xfce-other.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-other
-_Name=Other
-_Comment=Applications that don't fit into other categories
diff --git a/modules/menu/directory-data/xfce-science.directory.in b/modules/menu/directory-data/xfce-science.directory.in
deleted file mode 100644
index 990ea3a..0000000
--- a/modules/menu/directory-data/xfce-science.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-science
-_Name=Science
-_Comment=Scientific software
diff --git a/modules/menu/directory-data/xfce-screensavers.directory.in b/modules/menu/directory-data/xfce-screensavers.directory.in
deleted file mode 100644
index 4f93e1c..0000000
--- a/modules/menu/directory-data/xfce-screensavers.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=preferences-desktop-screensaver
-_Name=Screensavers
-_Comment=Screensaver applets
diff --git a/modules/menu/directory-data/xfce-settings.directory.in b/modules/menu/directory-data/xfce-settings.directory.in
deleted file mode 100644
index 6dc9bde..0000000
--- a/modules/menu/directory-data/xfce-settings.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=preferences-desktop
-_Name=Settings
-_Comment=Desktop and system settings applications
diff --git a/modules/menu/directory-data/xfce-system.directory.in b/modules/menu/directory-data/xfce-system.directory.in
deleted file mode 100644
index 516cb61..0000000
--- a/modules/menu/directory-data/xfce-system.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Type=Directory
-Icon=applications-system
-_Name=System
-_Comment=System tools and utilities
diff --git a/modules/menu/menu-data/Makefile.am b/modules/menu/menu-data/Makefile.am
deleted file mode 100644
index c9379bc..0000000
--- a/modules/menu/menu-data/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-desktopdir = $(datadir)/applications
-desktop_in_files = \
- xfce4-about-xfce.desktop.in \
- xfce4-help.desktop.in \
- xfce4-logout.desktop.in \
- xfce4-run-program.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
-
-menudir = $(sysconfdir)/xdg/menus
-menu_DATA = xfce-applications.menu
-
-EXTRA_DIST = $(desktop_in_files) $(menu_DATA)
-
-DISTCLEANFILES = $(desktop_DATA)
diff --git a/modules/menu/menu-data/xfce-applications.menu b/modules/menu/menu-data/xfce-applications.menu
deleted file mode 100644
index 71f6ba5..0000000
--- a/modules/menu/menu-data/xfce-applications.menu
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
- <Name>Xfce</Name>
-
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
-
- <Include>
- <Category>X-Xfce-Toplevel</Category>
- </Include>
-
- <Layout>
- <Filename>xfce4-run-program.desktop</Filename>
- <Separator/>
- <Filename>exo-terminal-emulator.desktop</Filename>
- <Filename>exo-file-manager.desktop</Filename>
- <Filename>exo-mail-reader.desktop</Filename>
- <Filename>exo-web-browser.desktop</Filename>
- <Separator/>
- <Menuname>Settings</Menuname>
- <Separator/>
- <Merge type="all"/>
- <Separator/>
- <Filename>xfce4-help.desktop</Filename>
- <Filename>xfce4-about-xfce.desktop</Filename>
- <Filename>xfce4-logout.desktop</Filename>
- </Layout>
-
- <Menu>
- <Name>Settings</Name>
- <Directory>xfce-settings.directory</Directory>
- <Include>
- <Category>Settings</Category>
- </Include>
-
- <Layout>
- <Filename>xfce-settings-manager.desktop</Filename>
- <Separator/>
- <Merge type="all"/>
- </Layout>
-
- <Menu>
- <Name>Screensavers</Name>
- <Directory>xfce-screensavers.directory</Directory>
- <Include>
- <Category>Screensaver</Category>
- </Include>
- </Menu>
- </Menu>
-
- <Menu>
- <Name>Accessories</Name>
- <Directory>xfce-accessories.directory</Directory>
- <Include>
- <Or>
- <Category>Accessibility</Category>
- <Category>Core</Category>
- <Category>Legacy</Category>
- <Category>Utility</Category>
- </Or>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Development</Name>
- <Directory>xfce-development.directory</Directory>
- <Include>
- <Category>Development</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Education</Name>
- <Directory>xfce-education.directory</Directory>
- <Include>
- <Category>Education</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Games</Name>
- <Directory>xfce-games.directory</Directory>
- <Include>
- <Category>Game</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Graphics</Name>
- <Directory>xfce-graphics.directory</Directory>
- <Include>
- <Category>Graphics</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Multimedia</Name>
- <Directory>xfce-multimedia.directory</Directory>
- <Include>
- <Category>Audio</Category>
- <Category>Video</Category>
- <Category>AudioVideo</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Network</Name>
- <Directory>xfce-network.directory</Directory>
- <Include>
- <Category>Network</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Office</Name>
- <Directory>xfce-office.directory</Directory>
- <Include>
- <Category>Office</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Science</Name>
- <Directory>xfce-science.directory</Directory>
- <Include>
- <Category>Science</Category>
- </Include>
- </Menu>
-
- <Menu>
- <Name>System</Name>
- <Directory>xfce-system.directory</Directory>
- <Include>
- <Or>
- <Category>Emulator</Category>
- <Category>System</Category>
- </Or>
- </Include>
- </Menu>
-
- <Menu>
- <Name>Other</Name>
- <Directory>xfce-other.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <All/>
- </Include>
- </Menu>
-
-</Menu>
diff --git a/modules/menu/menu-data/xfce4-about-xfce.desktop.in b/modules/menu/menu-data/xfce4-about-xfce.desktop.in
deleted file mode 100644
index 701a04a..0000000
--- a/modules/menu/menu-data/xfce4-about-xfce.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=xfce4-about
-Icon=help-about
-StartupNotify=false
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=About Xfce
-_Comment=Information about the Xfce Desktop Environment
diff --git a/modules/menu/menu-data/xfce4-help.desktop.in b/modules/menu/menu-data/xfce4-help.desktop.in
deleted file mode 100644
index 2eb88de..0000000
--- a/modules/menu/menu-data/xfce4-help.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=xfhelp4
-Icon=help-contents
-StartupNotify=false
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=Help
-_Comment=Help using Xfce
diff --git a/modules/menu/menu-data/xfce4-logout.desktop.in b/modules/menu/menu-data/xfce4-logout.desktop.in
deleted file mode 100644
index f75cf73..0000000
--- a/modules/menu/menu-data/xfce4-logout.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=xfce4-session-logout
-Icon=system-log-out
-StartupNotify=false
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=Log Out
-_Comment=Log out of the Xfce Desktop
diff --git a/modules/menu/menu-data/xfce4-run-program.desktop.in b/modules/menu/menu-data/xfce4-run-program.desktop.in
deleted file mode 100644
index ec9e446..0000000
--- a/modules/menu/menu-data/xfce4-run-program.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=xfrun4
-Icon=system-run
-StartupNotify=false
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=Run Program...
-_Comment=Run a program
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40d6400..7914f87 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,23 +17,6 @@ src/xfdesktop-special-file-icon.c
src/xfdesktop-volume-icon.c
# files added by intltool-prepare.
-modules/menu/directory-data/xfce-accessories.directory.in
-modules/menu/directory-data/xfce-development.directory.in
-modules/menu/directory-data/xfce-education.directory.in
-modules/menu/directory-data/xfce-games.directory.in
-modules/menu/directory-data/xfce-graphics.directory.in
-modules/menu/directory-data/xfce-multimedia.directory.in
-modules/menu/directory-data/xfce-network.directory.in
-modules/menu/directory-data/xfce-office.directory.in
-modules/menu/directory-data/xfce-other.directory.in
-modules/menu/directory-data/xfce-science.directory.in
-modules/menu/directory-data/xfce-screensavers.directory.in
-modules/menu/directory-data/xfce-settings.directory.in
-modules/menu/directory-data/xfce-system.directory.in
-modules/menu/menu-data/xfce4-about-xfce.desktop.in
-modules/menu/menu-data/xfce4-help.desktop.in
-modules/menu/menu-data/xfce4-logout.desktop.in
-modules/menu/menu-data/xfce4-run-program.desktop.in
settings/xfce-backdrop-settings.desktop.in
settings/xfdesktop-settings-ui.xml
settings/xfdesktop-settings-appearance-frame-ui.xml
More information about the Xfce4-commits
mailing list