[Xfce4-commits] <exo:master> Add various helpers.

Nick Schermer noreply at xfce.org
Thu Dec 27 13:48:01 CET 2012


Updating branch refs/heads/master
         to ffce29b1fe261ff3ce52bfb199095d532a6ba277 (commit)
       from f3a2c8ba5f456d3ae3831c5daf6ff4d3f27e3edf (commit)

commit ffce29b1fe261ff3ce52bfb199095d532a6ba277
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 27 13:46:21 2012 +0100

    Add various helpers.

 exo-helper/helpers/Makefile.am                     |   15 ++++++++++++---
 exo-helper/helpers/caja.desktop.in.in              |   10 ++++++++++
 .../{galeon.desktop.in.in => dillo.desktop.in.in}  |    6 +++---
 ...ceweasel.desktop.in.in => icecat.desktop.in.in} |    6 +++---
 ...{midori.desktop.in.in => jumanji.desktop.in.in} |    7 +++----
 .../{Thunar.desktop.in.in => rodent.desktop.in.in} |    7 +++----
 ...hunar.desktop.in.in => rox-filer.desktop.in.in} |    7 +++----
 ...terminal.desktop.in.in => sakura.desktop.in.in} |    8 ++++----
 .../{Thunar.desktop.in.in => xfe.desktop.in.in}    |    7 +++----
 po/POTFILES.in                                     |   13 +++++++++++--
 10 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index a0139cb..16cdbbd 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -4,12 +4,13 @@ defaults_DATA = helpers.rc
 
 desktopdir = $(datadir)/xfce4/helpers
 desktop_in_in_files =							\
-	Thunar.desktop.in.in						\
 	aterm.desktop.in.in						\
 	balsa.desktop.in.in						\
+	caja.desktop.in.in						\
 	chromium.desktop.in.in						\
 	debian-sensible-browser.desktop.in.in				\
 	debian-x-terminal-emulator.desktop.in.in			\
+	dillo.desktop.in.in						\
 	encompass.desktop.in.in						\
 	epiphany.desktop.in.in						\
 	eterm.desktop.in.in						\
@@ -17,10 +18,12 @@ desktop_in_in_files =							\
 	firefox.desktop.in.in						\
 	galeon.desktop.in.in						\
 	gnome-terminal.desktop.in.in					\
-	kmail.desktop.in.in						\
-	konqueror.desktop.in.in						\
+	icecat.desktop.in.in						\
 	icedove.desktop.in.in						\
 	iceweasel.desktop.in.in						\
+	jumanji.desktop.in.in						\
+	kmail.desktop.in.in						\
+	konqueror.desktop.in.in						\
 	links.desktop.in.in						\
 	lynx.desktop.in.in						\
 	midori.desktop.in.in						\
@@ -33,14 +36,20 @@ desktop_in_in_files =							\
 	opera-browser.desktop.in.in					\
 	opera-mailer.desktop.in.in					\
 	pcmanfm.desktop.in.in						\
+	rodent.desktop.in.in						\
+	rox-filer.desktop.in.in						\
+	sakura.desktop.in.in						\
 	sylpheed.desktop.in.in						\
 	sylpheed-claws.desktop.in.in					\
+	Thunar.desktop.in.in						\
 	thunderbird.desktop.in.in					\
 	urxvt.desktop.in.in						\
 	w3m.desktop.in.in						\
 	xfce4-terminal.desktop.in.in					\
+	xfe.desktop.in.in						\
 	xterm.desktop.in.in
 
+
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 %.desktop.in: %.desktop.in.in
diff --git a/exo-helper/helpers/caja.desktop.in.in b/exo-helper/helpers/caja.desktop.in.in
new file mode 100644
index 0000000..0d07406
--- /dev/null
+++ b/exo-helper/helpers/caja.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Icon=system-file-manager
+Type=X-XFCE-Helper
+_Name=Caja File Manager
+StartupNotify=true
+X-XFCE-Binaries=caja;
+X-XFCE-Category=FileManager
+X-XFCE-Commands=%B;
+X-XFCE-CommandsWithParameter=%B --no-desktop --browser "%s";
diff --git a/exo-helper/helpers/galeon.desktop.in.in b/exo-helper/helpers/dillo.desktop.in.in
similarity index 70%
copy from exo-helper/helpers/galeon.desktop.in.in
copy to exo-helper/helpers/dillo.desktop.in.in
index 7369b34..f79169f 100644
--- a/exo-helper/helpers/galeon.desktop.in.in
+++ b/exo-helper/helpers/dillo.desktop.in.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
-Icon=galeon
+Icon=networking_www_section
 Type=X-XFCE-Helper
-_Name=Galeon Web Browser
+_Name=Dillo
 StartupNotify=true
-X-XFCE-Binaries=galeon;
+X-XFCE-Binaries=dillo;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B;
 X-XFCE-CommandsWithParameter=%B "%s";
diff --git a/exo-helper/helpers/iceweasel.desktop.in.in b/exo-helper/helpers/icecat.desktop.in.in
similarity index 71%
copy from exo-helper/helpers/iceweasel.desktop.in.in
copy to exo-helper/helpers/icecat.desktop.in.in
index bb3d5fe..fb4ea37 100644
--- a/exo-helper/helpers/iceweasel.desktop.in.in
+++ b/exo-helper/helpers/icecat.desktop.in.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
-Icon=iceweasel
+Icon=icecat
 Type=X-XFCE-Helper
-_Name=Iceweasel
+_Name=Icecat
 StartupNotify=false
-X-XFCE-Binaries=iceweasel;iceweasel-gtk2;iceweasel-gtk;
+X-XFCE-Binaries=icecat;icecat-gtk2;icecat-gtk;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B -remote "openURL(about:blank,new-window)";%B;
 X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
diff --git a/exo-helper/helpers/midori.desktop.in.in b/exo-helper/helpers/jumanji.desktop.in.in
similarity index 74%
copy from exo-helper/helpers/midori.desktop.in.in
copy to exo-helper/helpers/jumanji.desktop.in.in
index cbb93bd..86cd8de 100644
--- a/exo-helper/helpers/midori.desktop.in.in
+++ b/exo-helper/helpers/jumanji.desktop.in.in
@@ -1,11 +1,10 @@
-
 [Desktop Entry]
 Version=1.0
-Icon=midori
+Icon=jumanji
 Type=X-XFCE-Helper
-_Name=Midori
+_Name=Jumanji
 StartupNotify=true
-X-XFCE-Binaries=midori;
+X-XFCE-Binaries=jumanji;
 X-XFCE-Category=WebBrowser
 X-XFCE-Commands=%B;
 X-XFCE-CommandsWithParameter=%B "%s";
diff --git a/exo-helper/helpers/Thunar.desktop.in.in b/exo-helper/helpers/rodent.desktop.in.in
similarity index 68%
copy from exo-helper/helpers/Thunar.desktop.in.in
copy to exo-helper/helpers/rodent.desktop.in.in
index 6555c60..e313920 100644
--- a/exo-helper/helpers/Thunar.desktop.in.in
+++ b/exo-helper/helpers/rodent.desktop.in.in
@@ -1,11 +1,10 @@
-
 [Desktop Entry]
 Version=1.0
-Icon=Thunar
+Icon=folder
 Type=X-XFCE-Helper
-_Name=Thunar
+_Name=Rodent File Manager
 StartupNotify=true
-X-XFCE-Binaries=Thunar;
+X-XFCE-Binaries=rodent-forked;
 X-XFCE-Category=FileManager
 X-XFCE-Commands=%B;
 X-XFCE-CommandsWithParameter=%B "%s";
diff --git a/exo-helper/helpers/Thunar.desktop.in.in b/exo-helper/helpers/rox-filer.desktop.in.in
similarity index 67%
copy from exo-helper/helpers/Thunar.desktop.in.in
copy to exo-helper/helpers/rox-filer.desktop.in.in
index 6555c60..4a342af 100644
--- a/exo-helper/helpers/Thunar.desktop.in.in
+++ b/exo-helper/helpers/rox-filer.desktop.in.in
@@ -1,11 +1,10 @@
-
 [Desktop Entry]
 Version=1.0
-Icon=Thunar
+Icon=/usr/libexec/ROX-Filer/.DirIcon
 Type=X-XFCE-Helper
-_Name=Thunar
+_Name=ROX-Filer
 StartupNotify=true
-X-XFCE-Binaries=Thunar;
+X-XFCE-Binaries=rox;
 X-XFCE-Category=FileManager
 X-XFCE-Commands=%B;
 X-XFCE-CommandsWithParameter=%B "%s";
diff --git a/exo-helper/helpers/gnome-terminal.desktop.in.in b/exo-helper/helpers/sakura.desktop.in.in
similarity index 56%
copy from exo-helper/helpers/gnome-terminal.desktop.in.in
copy to exo-helper/helpers/sakura.desktop.in.in
index bb31360..af8b1d9 100644
--- a/exo-helper/helpers/gnome-terminal.desktop.in.in
+++ b/exo-helper/helpers/sakura.desktop.in.in
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
-Icon=gnome-terminal
+Icon=terminal-tango
 Type=X-XFCE-Helper
-_Name=GNOME Terminal
-StartupNotify=true
-X-XFCE-Binaries=gnome-terminal;gnometerminal;
+_Name=Sakura
+StartupNotify=false
+X-XFCE-Binaries=sakura;
 X-XFCE-Category=TerminalEmulator
 X-XFCE-Commands=%B;
 X-XFCE-CommandsWithParameter=%B -x %s;
diff --git a/exo-helper/helpers/Thunar.desktop.in.in b/exo-helper/helpers/xfe.desktop.in.in
similarity index 74%
copy from exo-helper/helpers/Thunar.desktop.in.in
copy to exo-helper/helpers/xfe.desktop.in.in
index 6555c60..512fa01 100644
--- a/exo-helper/helpers/Thunar.desktop.in.in
+++ b/exo-helper/helpers/xfe.desktop.in.in
@@ -1,11 +1,10 @@
-
 [Desktop Entry]
 Version=1.0
-Icon=Thunar
+Icon=xfe
 Type=X-XFCE-Helper
-_Name=Thunar
+_Name=Xfe File Manager
 StartupNotify=true
-X-XFCE-Binaries=Thunar;
+X-XFCE-Binaries=xfe;
 X-XFCE-Category=FileManager
 X-XFCE-Commands=%B;
 X-XFCE-CommandsWithParameter=%B "%s";
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f0e561..dc50706 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,12 +42,14 @@ exo-helper/exo-helper-utils.c
 exo-helper/exo-helper.c
 exo-helper/exo-preferred-applications.desktop.in
 exo-helper/main.c
-exo-helper/helpers/Thunar.desktop.in.in
+
 exo-helper/helpers/aterm.desktop.in.in
 exo-helper/helpers/balsa.desktop.in.in
+exo-helper/helpers/caja.desktop.in.in
 exo-helper/helpers/chromium.desktop.in.in
 exo-helper/helpers/debian-sensible-browser.desktop.in.in
 exo-helper/helpers/debian-x-terminal-emulator.desktop.in.in
+exo-helper/helpers/dillo.desktop.in.in
 exo-helper/helpers/encompass.desktop.in.in
 exo-helper/helpers/epiphany.desktop.in.in
 exo-helper/helpers/eterm.desktop.in.in
@@ -55,8 +57,10 @@ exo-helper/helpers/evolution.desktop.in.in
 exo-helper/helpers/firefox.desktop.in.in
 exo-helper/helpers/galeon.desktop.in.in
 exo-helper/helpers/gnome-terminal.desktop.in.in
+exo-helper/helpers/icecat.desktop.in.in
 exo-helper/helpers/icedove.desktop.in.in
 exo-helper/helpers/iceweasel.desktop.in.in
+exo-helper/helpers/jumanji.desktop.in.in
 exo-helper/helpers/kmail.desktop.in.in
 exo-helper/helpers/konqueror.desktop.in.in
 exo-helper/helpers/links.desktop.in.in
@@ -71,12 +75,17 @@ exo-helper/helpers/nxterm.desktop.in.in
 exo-helper/helpers/opera-browser.desktop.in.in
 exo-helper/helpers/opera-mailer.desktop.in.in
 exo-helper/helpers/pcmanfm.desktop.in.in
-exo-helper/helpers/sylpheed-claws.desktop.in.in
+exo-helper/helpers/rodent.desktop.in.in
+exo-helper/helpers/rox-filer.desktop.in.in
+exo-helper/helpers/sakura.desktop.in.in
 exo-helper/helpers/sylpheed.desktop.in.in
+exo-helper/helpers/sylpheed-claws.desktop.in.in
+exo-helper/helpers/Thunar.desktop.in.in
 exo-helper/helpers/thunderbird.desktop.in.in
 exo-helper/helpers/urxvt.desktop.in.in
 exo-helper/helpers/w3m.desktop.in.in
 exo-helper/helpers/xfce4-terminal.desktop.in.in
+exo-helper/helpers/xfe.desktop.in.in
 exo-helper/helpers/xterm.desktop.in.in
 
 exo-open/main.c


More information about the Xfce4-commits mailing list