Add versioned help when a GtkPlug

Desktop / Xfce / Xfdesktop - Eric Koegel [gmail.com] - 9 March 2014 10:24 UTC

This patch calls the versioned online help docs when xfdesktop-settings is embedded as a GtkPlug.

###

diff --git a/configure.ac.in b/configure.ac.in
index 2f6e411..d162dac 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -85,6 +85,8 @@ fi

dnl define xfdesktop's short version (major.minor)
AC_DEFINE([XFDESKTOP_VERSION_SHORT], [xfdesktop_version_short], [Short version string of xfdesktop])
+dnl replace the version in settings/xfce-backdrop-settings.desktop.in.in
+AC_SUBST([XFDESKTOP_VERSION_SHORT], [xfdesktop_version_short])

dnl required
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
@@ -209,6 +211,7 @@ common/Makefile
doc/Makefile
pixmaps/Makefile
po/Makefile.in
+settings/xfce-backdrop-settings.desktop.in
settings/Makefile
src/Makefile
])
diff --git a/settings/xfce-backdrop-settings.desktop.in b/settings/xfce-backdrop-settings.desktop.in
deleted file mode 100644
index ce87ed2..0000000
--- a/settings/xfce-backdrop-settings.desktop.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=Desktop
-_Comment=Set desktop background and menu and icon behaviour
-Exec=xfdesktop-settings
-Icon=preferences-desktop-wallpaper
-Terminal=false
-Type=Application
-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
-OnlyShowIn=XFCE;
-StartupNotify=true
-X-XfcePluggable=true
-X-XfceHelpComponent=xfdesktop
-X-XfceHelpPage=preferences
diff --git a/settings/xfce-backdrop-settings.desktop.in.in b/settings/xfce-backdrop-settings.desktop.in.in
new file mode 100644
index 0000000..73d92a8
--- /dev/null
+++ b/settings/xfce-backdrop-settings.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+_Name=Desktop
+_Comment=Set desktop background and menu and icon behaviour
+Exec=xfdesktop-settings
+Icon=preferences-desktop-wallpaper
+Terminal=false
+Type=Application
+Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
+OnlyShowIn=XFCE;
+StartupNotify=true
+X-XfcePluggable=true
+X-XfceHelpComponent=xfdesktop
+X-XfceHelpPage=start
+X-XfceHelpVersion=4.11

d27d14f Add versioned help when a GtkPlug
configure.ac.in | 3 +++
settings/xfce-backdrop-settings.desktop.in | 14 --------------
settings/xfce-backdrop-settings.desktop.in.in | 15 +++++++++++++++
3 files changed, 18 insertions(+), 14 deletions(-)

Upstream: git.xfce.org

  • Share