Merge lp:~noskcaj/ubuntu/trusty/xfce4-settings/1289411 into lp:ubuntu/trusty/xfce4-settings

[Jackson Doak]

Fix the help function, needed for xubuntu 14.04

[Sebastien Bacher (seb128)]

Thanks

review: Approve

[Sebastien Bacher (seb128)]

https://launchpad.net/ubuntu/trusty/+source/xfce4-settings/4.11.2-1ubuntu2

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-26 07:41:42 +0000
+++ debian/changelog	2014-03-21 22:44:40 +0000
@@ -1,3 +1,10 @@
+xfce4-settings (4.11.2-1ubuntu2) trusty; urgency=medium
+
+  * Add 02_versioned-help-files.patch. (LP: #1289411)
+    Thanks Eric Koegel
+
+ -- Jackson Doak <[e-mail]>  Sat, 22 Mar 2014 09:20:53 +1100
+
 xfce4-settings (4.11.2-1ubuntu1) trusty; urgency=medium
 
   * Merge from Debian experimental, remaining changes:

=== added file 'debian/patches/02_versioned-help-files.patch'
--- debian/patches/02_versioned-help-files.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_versioned-help-files.patch	2014-03-21 22:44:40 +0000
@@ -0,0 +1,59 @@
+Author: Eric Koegel <[e-mail]>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10740
+Bug-Ubuntu: https://launchpad.net/bugs/1289411
+Description: Add support for versioned help desktop files
+
+---
+ xfce4-settings-manager/xfce-settings-manager-dialog.c |   13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
++++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
+@@ -79,6 +79,7 @@ struct _XfceSettingsManagerDialog
+ 
+     gchar          *help_page;
+     gchar          *help_component;
++    gchar          *help_version;
+ };
+ 
+ typedef struct
+@@ -290,6 +291,7 @@ xfce_settings_manager_dialog_finalize (G
+ 
+     g_free (dialog->help_page);
+     g_free (dialog->help_component);
++    g_free (dialog->help_version);
+ 
+     g_free (dialog->filter_text);
+ 
+@@ -334,9 +336,11 @@ xfce_settings_manager_dialog_response (G
+         else
+             help_component = "xfce4-settings";
+ 
+-        xfce_dialog_show_help (GTK_WINDOW (widget),
+-                               help_component,
+-                               dialog->help_page, NULL);
++        xfce_dialog_show_help_with_version (GTK_WINDOW (widget),
++                                            help_component,
++                                            dialog->help_page,
++                                            NULL,
++                                            dialog->help_version);
+     }
+     else
+     {
+@@ -599,6 +603,8 @@ xfce_settings_manager_dialog_go_back (Xf
+     dialog->help_page = NULL;
+     g_free (dialog->help_component);
+     dialog->help_component = NULL;
++    g_free (dialog->help_version);
++    dialog->help_version = NULL;
+ 
+     gtk_widget_set_sensitive (dialog->button_back, FALSE);
+     gtk_widget_set_sensitive (dialog->button_help, TRUE);
+@@ -844,6 +850,7 @@ xfce_settings_manager_dialog_spawn (Xfce
+         {
+             dialog->help_page = g_strdup (xfce_rc_read_entry (rc, "X-XfceHelpPage", NULL));
+             dialog->help_component = g_strdup (xfce_rc_read_entry (rc, "X-XfceHelpComponent", NULL));
++            dialog->help_version = g_strdup (xfce_rc_read_entry (rc, "X-XfceHelpVersion", NULL));
+         }
+ 
+         xfce_rc_close (rc);

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-28 22:55:21 +0000
+++ debian/patches/series	2014-03-21 22:44:40 +0000
@@ -1,2 +1,3 @@
 01_use-tango-icon-theme.patch
 xubuntu_vanilla-session-themes.patch
+02_versioned-help-files.patch