[Xfce4-commits] <xfdesktop:master> Move some menu data to exo.

[Nick Schermer]

Updating branch refs/heads/master
         to fc52953924af8abcedd6c179d29984d7011a7e43 (commit)
       from c2c2cffd39d0bfe903de931624a69d259e59e36b (commit)

commit fc52953924af8abcedd6c179d29984d7011a7e43
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 28 11:51:46 2010 +0100

    Move some menu data to exo.
    
    Actual commands are provided by exo-open, so better if exo installs
    those files. Also allows the panel to use the exo desktop files
    since it does not depend on xfdesktop.

 modules/menu/menu-data/Makefile.am                 |    5 +----
 modules/menu/menu-data/xfce-applications.menu      |    6 +++---
 .../menu/menu-data/xfce4-file-manager.desktop.in   |   12 ------------
 modules/menu/menu-data/xfce4-terminal.desktop.in   |   12 ------------
 .../menu/menu-data/xfce4-web-browser.desktop.in    |   12 ------------
 po/POTFILES.in                                     |    3 ---
 6 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/modules/menu/menu-data/Makefile.am b/modules/menu/menu-data/Makefile.am
index ffdf67e..c9379bc 100644
--- a/modules/menu/menu-data/Makefile.am
+++ b/modules/menu/menu-data/Makefile.am
@@ -1,12 +1,9 @@
 desktopdir = $(datadir)/applications
 desktop_in_files = \
 	xfce4-about-xfce.desktop.in \
-	xfce4-file-manager.desktop.in \
 	xfce4-help.desktop.in \
 	xfce4-logout.desktop.in \
-	xfce4-run-program.desktop.in \
-	xfce4-terminal.desktop.in \
-	xfce4-web-browser.desktop.in
+	xfce4-run-program.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/modules/menu/menu-data/xfce-applications.menu b/modules/menu/menu-data/xfce-applications.menu
index 68d65ce..1933464 100644
--- a/modules/menu/menu-data/xfce-applications.menu
+++ b/modules/menu/menu-data/xfce-applications.menu
@@ -14,9 +14,9 @@
     <Layout>
         <Filename>xfce4-run-program.desktop</Filename>
         <Separator/>
-        <Filename>xfce4-terminal.desktop</Filename>
-        <Filename>xfce4-file-manager.desktop</Filename>
-        <Filename>xfce4-web-browser.desktop</Filename>
+        <Filename>exo-terminal-emulator.desktop</Filename>
+        <Filename>exo-file-manager.desktop</Filename>
+        <Filename>exo-web-browser.desktop</Filename>
         <Separator/>
         <Menuname>Settings</Menuname>
         <Separator/>
diff --git a/modules/menu/menu-data/xfce4-file-manager.desktop.in b/modules/menu/menu-data/xfce4-file-manager.desktop.in
deleted file mode 100644
index 8d98ae9..0000000
--- a/modules/menu/menu-data/xfce4-file-manager.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=Thunar
-Icon=system-file-manager
-StartupNotify=true
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=File Manager
-_Comment=Thunar file manager
diff --git a/modules/menu/menu-data/xfce4-terminal.desktop.in b/modules/menu/menu-data/xfce4-terminal.desktop.in
deleted file mode 100644
index d64212b..0000000
--- a/modules/menu/menu-data/xfce4-terminal.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=exo-open --launch TerminalEmulator
-Icon=utilities-terminal
-StartupNotify=false
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=Terminal
-_Comment=Terminal emulator
diff --git a/modules/menu/menu-data/xfce4-web-browser.desktop.in b/modules/menu/menu-data/xfce4-web-browser.desktop.in
deleted file mode 100644
index 9d03003..0000000
--- a/modules/menu/menu-data/xfce4-web-browser.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Exec=exo-open --launch WebBrowser %u
-Icon=web-browser
-StartupNotify=false
-Terminal=false
-Categories=X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-_Name=Web Browser
-_Comment=Browse the web
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bc9586a..9743c10 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,12 +33,9 @@ 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-file-manager.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
-modules/menu/menu-data/xfce4-terminal.desktop.in
-modules/menu/menu-data/xfce4-web-browser.desktop.in
 settings/xfce-backdrop-settings.desktop.in
 settings/xfdesktop-settings-ui.xml
 settings/xfdesktop-settings-appearance-frame-ui.xml