[Xfce4-commits] [xfce/xfdesktop] 01/02: Point to versioned help docs

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit 67a8cfb24fc4131e6cd74a52901e5389cc9b6757
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Tue Mar 4 21:13:01 2014 +0300

    Point to versioned help docs
    
    xfdesktop-settings now points to the versioned docs hosted at
    docs.xfce.org. This version string will always point to the
    major.minor of xfdesktop so it will auto-increment in future relases.
---
 configure.ac.in |   12 +++++++++++-
 settings/main.c |   10 +++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 1a0fe09..2f6e411 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -16,7 +16,7 @@ dnl minimum required versions
 m4_define([glib_minimum_version], [2.30.0])
 m4_define([gtk_minimum_version], [2.24.0])
 m4_define([libxfce4util_minimum_version], [4.10.0])
-m4_define([libxfce4ui_minimum_version], [4.10.0])
+m4_define([libxfce4ui_minimum_version], [4.11.1])
 m4_define([xfce_minimum_version], [4.10.0])
 m4_define([garcon_minimum_version], [0.1.2])
 m4_define([exo_minimum_version], [0.7.0])
@@ -26,6 +26,13 @@ m4_define([wnck_minimum_version], [2.30])
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfconf_minimum_version], [4.10.0])
 
+dnl define a short version string for xfdesktop
+m4_append([xfdesktop_version_short], ["])
+m4_append([xfdesktop_version_short], [xfdesktop_version_major])
+m4_append([xfdesktop_version_short], [.])
+m4_append([xfdesktop_version_short], [xfdesktop_version_minor])
+m4_append([xfdesktop_version_short], ["])
+
 dnl init autoconf
 AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
@@ -76,6 +83,9 @@ if test x"$DBUS_BINDING_TOOL" = x"no"; then
   a custom location for it.])
 fi
 
+dnl define xfdesktop's short version (major.minor)
+AC_DEFINE([XFDESKTOP_VERSION_SHORT], [xfdesktop_version_short], [Short version string of xfdesktop])
+
 dnl required
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
diff --git a/settings/main.c b/settings/main.c
index 3a3cd2e..9ae221d 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1944,9 +1944,13 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
 static void
 xfdesktop_settings_response(GtkWidget *dialog, gint response_id, gpointer user_data)
 {
-    if(response_id == GTK_RESPONSE_HELP)
-        xfce_dialog_show_help(GTK_WINDOW(dialog), "xfdesktop", "preferences", NULL);
-    else {
+    if(response_id == GTK_RESPONSE_HELP) {
+        xfce_dialog_show_help_with_version(GTK_WINDOW(dialog),
+                                           "xfdesktop",
+                                           "preferences",
+                                           NULL,
+                                           XFDESKTOP_VERSION_SHORT);
+    } else {
         XfconfChannel *channel = (XfconfChannel*) user_data;
         GdkWindowState state;
         gint width, height;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.