[Xfce4-commits] [xfce/xfce4-settings] 01/01: Add support for versioned docs
noreply at xfce.org
noreply at xfce.org
Mon Feb 16 23:37:53 CET 2015
This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository xfce/xfce4-settings.
commit ca5c4aed4525c12935a8e61dbb0f2e0509e50c6a
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Feb 16 23:37:30 2015 +0100
Add support for versioned docs
All dialogs of xfce4-settings now point to the versioned docs hosted on
docs.xfce.org. As the version (major.minor) string is generated, it will
auto-increment for future releases.
---
configure.ac.in | 12 ++++++++++++
dialogs/accessibility-settings/main.c | 3 ++-
dialogs/appearance-settings/main.c | 3 ++-
dialogs/display-settings/main.c | 3 ++-
dialogs/keyboard-settings/main.c | 3 ++-
dialogs/mouse-settings/main.c | 3 ++-
xfce4-settings-editor/xfce-settings-editor-dialog.c | 7 ++++---
7 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 9bdb4cd..179049c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -17,6 +17,13 @@ m4_define([xfce4_settings_version_build], [@REVISION@])
m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
+dnl define a short version string for xfce4-settings
+m4_append([xfce4_settings_version_short], ["])
+m4_append([xfce4_settings_version_short], [xfce4_settings_version_major])
+m4_append([xfce4_settings_version_short], [.])
+m4_append([xfce4_settings_version_short], [xfce4_settings_version_minor])
+m4_append([xfce4_settings_version_short], ["])
+
dnl *******************************************
dnl *** Debugging support for GIT snapshots ***
dnl *******************************************
@@ -73,6 +80,11 @@ dnl ******************************
XDT_I18N([@LINGUAS@])
dnl ***********************************
+dnl *** Version string for the docs ***
+dnl ***********************************
+AC_DEFINE([XFCE4_SETTINGS_VERSION_SHORT], [xfce4_settings_version_short], [Short version string of xfce4-settings])
+
+dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.1])
diff --git a/dialogs/accessibility-settings/main.c b/dialogs/accessibility-settings/main.c
index 07d482e..554975f 100644
--- a/dialogs/accessibility-settings/main.c
+++ b/dialogs/accessibility-settings/main.c
@@ -164,7 +164,8 @@ accessibility_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
- xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "accessibility", NULL);
+ xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "accessibility",
+ NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
diff --git a/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c
index 49415a2..a946515 100644
--- a/dialogs/appearance-settings/main.c
+++ b/dialogs/appearance-settings/main.c
@@ -1456,7 +1456,8 @@ appearance_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
- xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "appearance", NULL);
+ xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "appearance",
+ NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 5ea3489..e08b1de 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1236,7 +1236,8 @@ display_settings_dialog_response (GtkDialog *dialog,
GtkBuilder *builder)
{
if (response_id == GTK_RESPONSE_HELP)
- xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "display", NULL);
+ xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "display",
+ NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
diff --git a/dialogs/keyboard-settings/main.c b/dialogs/keyboard-settings/main.c
index 8960c6b..0dbb64d 100644
--- a/dialogs/keyboard-settings/main.c
+++ b/dialogs/keyboard-settings/main.c
@@ -48,7 +48,8 @@ keyboard_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
- xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "keyboard", NULL);
+ xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "keyboard",
+ NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index a5d35c3..fddcc98 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -1834,7 +1834,8 @@ mouse_settings_dialog_response (GtkWidget *dialog,
gint response_id)
{
if (response_id == GTK_RESPONSE_HELP)
- xfce_dialog_show_help (GTK_WINDOW (dialog), "xfce4-settings", "mouse", NULL);
+ xfce_dialog_show_help_with_version (GTK_WINDOW (dialog), "xfce4-settings", "mouse",
+ NULL, XFCE4_SETTINGS_VERSION_SHORT);
else
gtk_main_quit ();
}
diff --git a/xfce4-settings-editor/xfce-settings-editor-dialog.c b/xfce4-settings-editor/xfce-settings-editor-dialog.c
index 4033206..49d8c3a 100644
--- a/xfce4-settings-editor/xfce-settings-editor-dialog.c
+++ b/xfce4-settings-editor/xfce-settings-editor-dialog.c
@@ -371,9 +371,10 @@ xfce_settings_editor_dialog_response (GtkDialog *widget,
if (response_id == GTK_RESPONSE_HELP)
{
- xfce_dialog_show_help (GTK_WINDOW (widget),
- "xfce4-settings",
- "settings-editor", NULL);
+ xfce_dialog_show_help_with_version (GTK_WINDOW (widget),
+ "xfce4-settings",
+ "settings-editor", NULL,
+ XFCE4_SETTINGS_VERSION_SHORT);
}
else
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list