[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: 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/xfce4-power-manager.

commit fd1eb3f3376788682334bd4bc02864677404d51e
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Sep 1 18:34:20 2014 +0300

    Point to versioned help docs
    
    xfpm now points to the versioned docs hosted at docs.xfce.org.
    This version string will always point to the major.minor of xfpm
    so it will auto-increment in future relases.
---
 configure.ac.in                                           |   12 +++++++++++-
 panel-plugins/power-manager-plugin/power-manager-button.c |    2 +-
 settings/xfpm-settings.c                                  |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index fef3f41..1eb0b71 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -64,7 +64,7 @@ m4_define([dbus_minimum_version], [1.1])
 m4_define([dbus_glib_minimum_version], [0.84])
 
 m4_define([xfconf_minimum_version], [4.10.0])
-m4_define([libxfce4ui_minimum_version],[4.10.0])
+m4_define([libxfce4ui_minimum_version],[4.11.1])
 m4_define([libxfce4util_minimum_version],[4.10.0])
 m4_define([libxfce4panel_minimum_version],[4.10.0])
 m4_define([lxdepanel_minimum_version],[0.5.6])
@@ -189,6 +189,16 @@ if test x$with_backend = xopenbsd; then
     AC_DEFINE(BACKEND_TYPE_OPENBSD, 1, [OpenBSD suspend/hibernate backend])
 fi
 
+dnl define a short version string for xfdesktop
+m4_append([xfpm_version_short], ["])
+m4_append([xfpm_version_short], [xfpm_version_major])
+m4_append([xfpm_version_short], [.])
+m4_append([xfpm_version_short], [xfpm_version_minor])
+m4_append([xfpm_version_short], ["])
+
+dnl define xfpm's short version (major.minor)
+AC_DEFINE([XFPM_VERSION_SHORT], [xfpm_version_short], [Short version string of xfce4-power-manager])
+
 #=======================================================#
 #              Check for debugging support              #
 #=======================================================#
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index a5fea7b..216f17f 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -823,7 +823,7 @@ power_manager_button_free_data_cb (XfcePanelPlugin *plugin, PowerManagerButton *
 static void
 help_cb (GtkMenuItem *menuitem, gpointer user_data)
 {
-    xfce_dialog_show_help (NULL, "xfce4-power-manager", "start", NULL);
+    xfce_dialog_show_help_with_version (NULL, "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
 }
 
 void
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 8445776..23ffb85 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -1997,7 +1997,7 @@ static void dialog_response_cb (GtkDialog *dialog, gint response, XfconfChannel
     switch(response)
     {
 	case GTK_RESPONSE_HELP:
-	    xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-power-manager", "start", NULL);
+	    xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-power-manager", "start", NULL, XFPM_VERSION_SHORT);
 	    break;
 	default:
 	    settings_quit (GTK_WIDGET (dialog), channel);

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