Updating branch refs/heads/master
to bb18fa8c31c0f1fa10b84010a5b05174378fd558 (commit)
from 008f396265e08d0ec5bf1e5f6f1a690e8f08d759 (commit)
commit bb18fa8c31c0f1fa10b84010a5b05174378fd558
Author: Nick Schermer <n...@xfce.org>
Date: Sun Nov 6 15:05:43 2011 +0100
Lowercase the thunar executable and install a Thunar symlink.
This way we can reliably use the lowercase name in desktop files
which improves auto completion in the application finder.
Thunar-folder-handler.desktop.in.in | 2 +-
Thunar.desktop.in.in | 2 +-
thunar/Makefile.am | 24 ++++++++++++------------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Thunar-folder-handler.desktop.in.in
b/Thunar-folder-handler.desktop.in.in
index 9c4e131..c3865c4 100644
--- a/Thunar-folder-handler.desktop.in.in
+++ b/Thunar-folder-handler.desktop.in.in
@@ -3,7 +3,7 @@ _Name=Open Folder with Thunar
_Comment=Open the specified folders in Thunar
_GenericName=Open Folder
TryExec=Thunar
-Exec=Thunar %F
+Exec=thunar %F
Icon=Thunar
NoDisplay=true
Terminal=false
diff --git a/Thunar.desktop.in.in b/Thunar.desktop.in.in
index a97fe57..739ea43 100644
--- a/Thunar.desktop.in.in
+++ b/Thunar.desktop.in.in
@@ -2,7 +2,7 @@
_Name=Thunar File Manager
_Comment=Browse the filesystem with the file manager
_GenericName=File Manager
-Exec=Thunar %F
+Exec=thunar %F
Icon=Thunar
Terminal=false
StartupNotify=true
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index b715fea..51f1810 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES =
\
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
-DEXO_DISABLE_DEPRECATED \
- -DG_LOG_DOMAIN=\"Thunar\" \
+ -DG_LOG_DOMAIN=\"thunar\" \
-DLIBDIR=\"$(libdir)\" \
-DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@@ -19,7 +19,7 @@ bin_SCRIPTS =
\
thunar-settings
bin_PROGRAMS = \
- Thunar
+ thunar
if HAVE_LIBNOTIFY
thunar_notify_sources =
\
@@ -31,7 +31,7 @@ thunar_built_sources =
\
thunar-marshal.c \
thunar-marshal.h
-Thunar_SOURCES = \
+thunar_SOURCES = \
$(thunar_include_HEADERS) \
$(thunar_built_sources) \
$(thunar_dbus_sources) \
@@ -227,7 +227,7 @@ Thunar_SOURCES =
\
thunar-window.h \
thunar-window-ui.h
-Thunar_CFLAGS =
\
+thunar_CFLAGS =
\
$(EXO_CFLAGS) \
$(GIO_CFLAGS) \
$(GTHREAD_CFLAGS) \
@@ -238,12 +238,12 @@ Thunar_CFLAGS =
\
$(LIBXFCE4UI_CFLAGS) \
$(PLATFORM_CFLAGS)
-Thunar_LDFLAGS = \
+thunar_LDFLAGS = \
-no-undefined \
$(LIBSM_LDFLAGS) \
$(PLATFORM_LDFLAGS)
-Thunar_LDADD = \
+thunar_LDADD = \
$(top_builddir)/tdb/libtdb.la \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
$(EXO_LIBS) \
@@ -255,7 +255,7 @@ Thunar_LDADD =
\
$(LIBSTARTUP_NOTIFICATION_LIBS) \
$(LIBXFCE4UI_LIBS)
-Thunar_DEPENDENCIES = \
+thunar_DEPENDENCIES = \
$(top_builddir)/tdb/libtdb.la \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
@@ -273,19 +273,19 @@ thunar_dbus_sources =
\
thunar-thumbnail-cache-proxy.h \
thunar-thumbnailer-proxy.h
-Thunar_CFLAGS += \
+thunar_CFLAGS += \
-DDBUS_API_SUBJECT_TO_CHANGE \
$(DBUS_CFLAGS)
-Thunar_LDADD +=
\
+thunar_LDADD +=
\
$(DBUS_LIBS)
endif
if HAVE_GIO_UNIX
-Thunar_CFLAGS += \
+thunar_CFLAGS += \
$(GIO_UNIX_CFLAGS)
-Thunar_LDADD +=
\
+thunar_LDADD +=
\
$(GIO_UNIX_LIBS)
endif
@@ -297,7 +297,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
# install symlink to 'thunar'
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(bindir)
- -( cd $(DESTDIR)$(bindir) ; test -x thunar || ln -sf Thunar thunar )
+ -( cd $(DESTDIR)$(bindir) ; test -x Thunar || ln -sf thunar Thunar )
clean-local:
rm -f *.core core core.*
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
