[Pkg-xfce-commits] r9729 - in /desktop/trunk/xfdesktop4/debian: changelog patches/0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Sat Feb 18 13:22:54 2017
New Revision: 9729

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=9729
Log:
* debian/patches
  - 0001-Settings-Allow-directories-to-be-selected-Bug-12832 fix regression
  with Gtk 2.24.31+ which preventing directories to be selected in
  wallpapers settings.                                        closes: #849823

Added:
    desktop/trunk/xfdesktop4/debian/patches/0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch
Modified:
    desktop/trunk/xfdesktop4/debian/changelog
    desktop/trunk/xfdesktop4/debian/patches/series

Modified: desktop/trunk/xfdesktop4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/changelog?rev=9729&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	(original)
+++ desktop/trunk/xfdesktop4/debian/changelog	Sat Feb 18 13:22:54 2017
@@ -1,3 +1,12 @@
+xfdesktop4 (4.12.3-4) UNRELEASED; urgency=medium
+
+  * debian/patches
+    - 0001-Settings-Allow-directories-to-be-selected-Bug-12832 fix regression
+    with Gtk 2.24.31+ which preventing directories to be selected in
+    wallpapers settings.                                        closes: #849823
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 18 Feb 2017 14:10:19 +0100
+
 xfdesktop4 (4.12.3-3) unstable; urgency=medium
 
   * debian/control:

Added: desktop/trunk/xfdesktop4/debian/patches/0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/patches/0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch?rev=9729&op=file
==============================================================================
--- desktop/trunk/xfdesktop4/debian/patches/0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch	(added)
+++ desktop/trunk/xfdesktop4/debian/patches/0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch	Sat Feb 18 13:22:54 2017
@@ -0,0 +1,28 @@
+From 726b34c0b37e778a4983866602cc20cfa4172b99 Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Mon, 13 Jun 2016 15:08:11 +0300
+Subject: [PATCH] Settings: Allow directories to be selected (Bug #12832)
+
+Gtk 2.24.31 imported some Gtk3 code that breaks directory
+selection when using a file filter while in directory mode.
+We need to add directories to the filter for the
+GtkFileChooser, otherwise you can't select directories
+while in directory mode...
+Cherry-picked from:
+https://git.xfce.org/users/eric/xfdesktop/commit/?h=the-long-road-to-gtk3&id=cc311b61b82b7510a3a6cb0952d3a331e3551e05
+---
+ settings/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/settings/main.c
++++ b/settings/main.c
+@@ -1857,6 +1857,9 @@ xfdesktop_settings_dialog_setup_tabs(Gtk
+     filter = gtk_file_filter_new();
+     gtk_file_filter_set_name(filter, _("Image files"));
+     gtk_file_filter_add_pixbuf_formats(filter);
++    gtk_file_filter_add_mime_type(filter, "inode/directory");
++    gtk_file_filter_add_mime_type(filter, "application/x-directory");
++    gtk_file_filter_add_mime_type(filter, "text/directory");
+     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(panel->btn_folder), filter);
+ 
+     /* Get default wallpaper folder */

Modified: desktop/trunk/xfdesktop4/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/debian/patches/series?rev=9729&op=diff
==============================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series	(original)
+++ desktop/trunk/xfdesktop4/debian/patches/series	Sat Feb 18 13:22:54 2017
@@ -0,0 +1 @@
+0001-Settings-Allow-directories-to-be-selected-Bug-12832.patch