thunar (1.0.2-1) debian-dir only changes

Summary

 debian/README.Debian                                       |   10 
 debian/bluetooth-sendto.desktop                            |    6 
 debian/changelog                                           |  462 +++++++++++++
 debian/compat                                              |    1 
 debian/control                                             |   66 +
 debian/copyright                                           |   51 +
 debian/gnome-obex-send.desktop                             |    6 
 debian/libthunar-vfs-1-2.install                           |    2 
 debian/libthunar-vfs-1-2.lintian-overrides                 |    2 
 debian/libthunar-vfs-1-2.postinst                          |   10 
 debian/libthunar-vfs-1-2.shlibs                            |    2 
 debian/libthunar-vfs-1-dev.install                         |    3 
 debian/libthunar-vfs-1-dev.postinst                        |   10 
 debian/patches/01_thunar-help-directory.patch              |   11 
 debian/patches/02_thunar-icon-naming-spec-compliance.patch |  441 ++++++++++++
 debian/patches/03_thunar-window-maximize.patch             |   75 ++
 debian/patches/05_fix-crash-drag-gdk-none.patch            |   25 
 debian/patches/06_fix-sidepane-width.patch                 |   23 
 debian/patches/07_update-cursor-on-delete.patch            |   37 +
 debian/patches/08_refilter-tree-hidden-dir.patch           |   95 ++
 debian/rules                                               |   54 +
 debian/thunar-data.docs                                    |    3 
 debian/thunar-data.install                                 |    2 
 debian/thunar.1                                            |    1 
 debian/thunar.install                                      |    4 
 debian/thunar.manpages                                     |    2 
 debian/thunar.menu                                         |    2 
 debian/thunar.postinst                                     |   10 
 debian/watch                                               |    3 
 debian/xfprint.desktop                                     |    6 
 30 files changed, 1425 insertions(+)

    
download this patch

Patch contents

--- thunar-1.0.2.orig/debian/compat
+++ thunar-1.0.2/debian/compat
@@ -0,0 +1 @@
+7
--- thunar-1.0.2.orig/debian/thunar.1
+++ thunar-1.0.2/debian/thunar.1
@@ -0,0 +1 @@
+.so man1/Thunar.1
--- thunar-1.0.2.orig/debian/libthunar-vfs-1-2.install
+++ thunar-1.0.2/debian/libthunar-vfs-1-2.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/thunarx-1/*
--- thunar-1.0.2.orig/debian/libthunar-vfs-1-2.shlibs
+++ thunar-1.0.2/debian/libthunar-vfs-1-2.shlibs
@@ -0,0 +1,2 @@
+libthunar-vfs-1 2 libthunar-vfs-1-2 (>= 1.0.0)
+libthunarx-1 2 libthunar-vfs-1-2 (>= 1.0.0)
--- thunar-1.0.2.orig/debian/copyright
+++ thunar-1.0.2/debian/copyright
@@ -0,0 +1,51 @@
+This package was debianized by Yves-Alexis Perez <corsac@corsac.net> on
+Thu, 17 Nov 2005 13:48:54 +0100.
+
+It was downloaded from http://thunar.xfce.org/
+
+Copyright Holders: 
+==================
+
+2004-2007 Benedikt Meurer <benny@xfce.org>
+2005 Jeffs Franks <jcfranks@xfce.org>
+
+thunarx is copyrighted:
+
+Copyright (c) 2004 The GLib Development Team.
+Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+
+thunar-vfs is copyrighted:
+
+Copyright (c) 2004 The GLib Development Team.
+Copyright (c) 2004-2005 Benedikt Meurer <benny@xfce.org>.
+
+tdb (trivial database system) is copyrighted:
+
+Copyright (c) 2001 	Anton Blanchard <anton@samba.org>
+Copyright (c) 2005 	Benedikt Meurer <benny@xfce.org>
+Copyright (c) 1999-2004 Andrew Tridgell <tridge@linuxcare.com>
+Copyright (c) 2000      Paul `Rusty' Russel <rusty@linuxcare.com>
+Copyright (c) 2000-2003 Jeremy Allison <jeremy@valinux.com>
+Copyright (c) 2001      Andrew Esh
+
+Licenses: 
+=========
+
+GNU/LGPL for files under thunarx, thunar-vfs , tdb folders
+GNU/GPL for the others
+
+GNU/FDL v1.1 or later for documentation, with no invariant sections, using the 
+following statement:
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU Free Documentation License, Version 1.1 or
+  any later version published by the Free Software Foundation; with no
+  Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+  Texts.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'
+The complete text of the GNU Library General Public License can be
+found in the file `/usr/share/common-licenses/LGPL'
+The complete text of the GFDL (version 1.2) can be found in the file
+`/usr/share/common-licenses/GFDL-1.2'
--- thunar-1.0.2.orig/debian/thunar.install
+++ thunar-1.0.2/debian/thunar.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/*
+debian/tmp/usr/lib/thunar/*
+debian/tmp/usr/share/applications/*
+debian/tmp/usr/share/xfce4/panel-plugins/thunar-tpa.desktop
--- thunar-1.0.2.orig/debian/thunar-data.install
+++ thunar-1.0.2/debian/thunar-data.install
@@ -0,0 +1,2 @@
+debian/tmp/etc/*
+debian/tmp/usr/share/*
--- thunar-1.0.2.orig/debian/thunar-data.docs
+++ thunar-1.0.2/debian/thunar-data.docs
@@ -0,0 +1,3 @@
+debian/README.Debian
+FAQ
+HACKING
--- thunar-1.0.2.orig/debian/bluetooth-sendto.desktop
+++ thunar-1.0.2/debian/bluetooth-sendto.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Bluetooth recipient
+Icon=stock_mailto
+Exec=bluetooth-sendto %F
+TryExec=bluetooth-sendto
--- thunar-1.0.2.orig/debian/thunar.manpages
+++ thunar-1.0.2/debian/thunar.manpages
@@ -0,0 +1,2 @@
+debian/thunar.1
+docs/Thunar.1
--- thunar-1.0.2.orig/debian/README.Debian
+++ thunar-1.0.2/debian/README.Debian
@@ -0,0 +1,10 @@
+thunar for Debian
+-----------------
+
+In order to use volume management features (i.e. mounting external disks/USB
+sticks/cameras etc) you should install hal and dbus.
+
+You also need to add yourself to the plugdev group and you may need to
+restart dbus after doing so if it is already running.
+
+ -- Xfce Packagers <pkg-xfce-devel@lists.alioth.debian.org>
--- thunar-1.0.2.orig/debian/libthunar-vfs-1-dev.postinst
+++ thunar-1.0.2/debian/libthunar-vfs-1-dev.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
+then
+  cd /usr/share/doc/libthunar-vfs-1-dev && rm -f thunar-data
+fi
+
+#DEBHELPER#
+
+exit 0
--- thunar-1.0.2.orig/debian/xfprint.desktop
+++ thunar-1.0.2/debian/xfprint.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Printer
+Exec=xfprint4 %f
+Icon=printer
+TryExec=xfprint4
--- thunar-1.0.2.orig/debian/rules
+++ thunar-1.0.2/debian/rules
@@ -0,0 +1,54 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers --enable-dbus --enable-startup-notification --enable-apr-plugin --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin
+
+DEB_DH_SHLIBDEPS_ARGS_thunar = -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
+
+makebuilddir/thunar:: debian/compat
+	# Some systems don't have POSIX_MADV* but have MADV* defined with
+	# the same values anyway.
+	grep -q POSIX_MADV foo || sed -i -e 's/POSIX_MADV/MADV/' \
+		$(CURDIR)/thunar-vfs/*.c
+	
+
+install/thunar::
+	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la 
+	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la 
+	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
+		$(CURDIR)/debian/tmp/usr/lib/thunar/thunar-* \
+		$(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*2 \
+		$(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
+		$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
+
+install/thunar-data::
+	cd $(CURDIR)/debian/tmp/usr/share/doc/ && mv Thunar thunar-data
+	rm -rf $(CURDIR)/debian/tmp/usr/share/man
+	# install sendto stuff
+	install -m 0644 $(CURDIR)/debian/bluetooth-sendto.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+	install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+	install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+
+binary-post-install/thunar-data::
+	rm -rf $(CURDIR)/debian/thunar-data/usr/share/applications
+	rm -rf $(CURDIR)/debian/thunar-data/usr/share/xfce4/
+
+# The symlinks below aren't enough for dpkg to replace a directory with a
+# symlink but they mean it's part of the package.
+
+binary-post-install/thunar::
+	rm -rf $(CURDIR)/debian/thunar/usr/share/doc/thunar
+	cd $(CURDIR)/debian/thunar/usr/share/doc/ && \
+		rm -rf thunar && ln  -sf thunar-data thunar
+
+binary-post-install/libthunar-vfs-1-2::
+	cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
+		rm -rf libthunar-vfs-1-2 && \
+		ln  -sf thunar-data libthunar-vfs-1-2
+
+binary-post-install/libthunar-vfs-1-dev::
+	cd $(CURDIR)/debian/libthunar-vfs-1-dev/usr/share/doc/ && \
+		rm -rf libthunar-vfs-1-dev && \
+		ln  -sf thunar-data libthunar-vfs-1-dev
--- thunar-1.0.2.orig/debian/thunar.menu
+++ thunar-1.0.2/debian/thunar.menu
@@ -0,0 +1,2 @@
+?package(thunar):needs="X11" section="Applications/File Management"\
+  title="Thunar" longtitle="Xfce4 File Manager" hints="File manager" command="/usr/bin/thunar"
--- thunar-1.0.2.orig/debian/changelog
+++ thunar-1.0.2/debian/changelog
@@ -0,0 +1,462 @@
+thunar (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/04_fix-umask-handling.patch: dropped, included upstream.
+  * debian/control: build-dep on libstartup-notification0-dev (>= 0.4) as
+    startup notification support is enabled in debian/rules.
+
+ -- Lionel Le Folgoc <mrpouit@gmail.com>  Sun, 23 May 2010 14:12:33 +0200
+
+thunar (1.0.1-4) unstable; urgency=low
+
+  * debian/patches/05_fix-crash-drag-gdk-none.patch: backport patch from
+    upstream git to fix crash when dragging non-file data over a window
+    (thanks Daniel Gibson for the hint).                        closes: #575665
+  * debian/patches: import some patches from lucid to fix several minor
+    issues (also fixed in upstream git master):
+    - 06_fix-sidepane-width.patch: use g_utf8_strlen to calculate the
+      sidepane width, prevents it from being too large with chinese or
+      cyrillic locales.                                         lp: #501211
+    - 07_update-cursor-on-delete.patch: properly update the cursor when
+      a row is deleted in, fixes weird cursor behaviors (Xfce #5361).
+    - 08_refilter-tree-hidden-dir.patch: refilter tree model view when
+      entering/leaving an hidden directory, prevents hidden dir/files
+      from being wrongly displayed.                             lp: #484220
+  * debian/control: add myself to uploaders.
+
+ -- Lionel Le Folgoc <mrpouit@gmail.com>  Sat, 24 Apr 2010 14:00:31 +0200
+
+thunar (1.0.1-3) unstable; urgency=low
+
+  * debian/control:
+    - drop strict versioned dependency on thunar-data for libthunarvfs
+      packages, only Thunar really needs it.
+    - switch libjpeg62-dev build-dep to libjpeg-dev.
+    - update standards version to 3.8.4.
+  * debian/watch updated.                                       closes: #570793
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 21 Feb 2010 16:24:34 +0100
+
+thunar (1.0.1-2) unstable; urgency=low
+
+  * debian/control:
+    - correct typo.                                             closes: #531448
+    - update standards version to 3.8.3
+  * debian/patches:
+    - 04_fix-umask-handling.patch added.                        closes: #549282
+  * debian/rules:
+    - dh_desktop is deprecated, remove it.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 06 Oct 2009 07:55:50 +0200
+
+thunar (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - move lib to libs section and -dev to libdevel.
+  * debian/*postinst:
+    - stop messing with the thunar-data symlink, and try removing it if it
+      exists.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 19 Apr 2009 18:42:36 +0200
+
+thunar (1.0.0-2) unstable; urgency=low
+
+  * Upload to unstable, and mark fixed bugs as such:
+    - show a confirmation dialog before deleting an action.     closes: #500652
+  * debian/patches:
+    - refresh 02_thunar-icon-naming-spec-compliance, more replacement.
+    - 03_thunar-window-maximize added, keep maximized state.    closes: #508184
+  * debian/control:
+    - move to xfce section.
+    - remove useless conflicts/replaces.
+    - update standards version to 3.8.1.
+    - update debhelper build-dep to 7.
+  * debian/compat bumped to 7.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 04 Apr 2009 01:43:06 +0200
+
+thunar (1.0.0-1) experimental; urgency=low
+
+  [ Xfce 4.6 Alpha “Pinkie” ]
+  * new upstream alpha release.
+  * debian/control:
+    - update standards version to 3.8.0. No change needed.
+    - updade build-deps for Xfce 4.6 Alpha.
+    - move thunar-volman from suggests to recommends.
+    - add recommends on xdg-user-dirs for Thunar to handle XDG user dirs.
+  * debian/patches:
+    - 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman dropped, merged
+      upstream.
+    - 03_use-eject-where-necessary as well.
+    - 04_es-l10n-typo.patch too. 
+    - 05_thunar-vfs-nozombies finally.
+  * debian/rules:
+    - fail if dh_install misses files.
+
+  [ Xfce 4.6 Beta 1 “Fuzzy”]
+  * new upstream beta release.
+  * debian/control:
+    - update build-deps for Fuzzy.
+
+  [ Xfce 4.6 Beta 2 “Hopper”]
+  * new upstream beta release.
+  * debian/control:
+    - update build-deps for Hopper.
+  * debian/libthunar-vfs-1-2.shlibs
+    - bump shlibs for Hopper.
+  * debian/patches:
+    - 02_fix-fam-closing-treeview added, fix file monitoring in treeview.
+    - 03_eject-handling added, display eject if and only if
+      is_ejectable=true. (Xfce r28895, #3978)
+    - 04_fix-listview-focus-deleted added, fix focus problem when deleting
+      a file in detailed list view. (Xfce r28902, #3884)
+
+  [ Xfce 4.6 Beta 3 “Tuco-tuco”]
+  * new upstream beta release.
+    - correctly close folders in treeview.                      closes: #478566 
+    - display “eject” if and only if device has is_ejectable.   closes: #500561
+    - fix focus problem when deleting in detailed list view.    closes: #446810
+  * debian/control:
+    - update build-deps for “Tuco-Tuco”.
+    - add build-dep on intltool.
+    - add ${misc:Depends} to various Depends: line.
+    - add dep on libglib2.0-dev (for thunar-vfs) and libgtk2.0-dev (for
+      thunarx) to -dev package.
+  * debian/libthunar-vfs-1-2.shlibs: bump shlibs.
+  * debian/patches:
+    - 02_fix-fam-closing-treeview dropped, merged upstream.
+    - 03_eject-handling as well.
+    - 04_fix-listview-focus-deleted finally.
+  * rename lintian override file so it's taken by dh_lintian.
+  * debian/rules:
+    - don't install lintian override, it's done by dh_lintian.
+    - call dh_desktop in binary-install.
+
+  [ Xfce 4.6 RC1 “Capybara” ]
+  * new upstream release candidate.
+  * debian/control:
+    - update build-deps for “Capybara”.
+  * debian/libthunar-vfs-1-2.shlibs:
+    - bump shlibs to 0.9.99.1.
+
+  [ Xfce 4.6 ]
+  * new upstream release.
+  * debian/control:
+    - update build-deps for 4.6.0.
+    - add ${misc:Depends} to -dev depends.
+  * debian/libthunar-vfs-1-2.shlibs:
+    - bump shlibs to 1.0.0.
+  * debian/patches:
+    - 02_thunar-icon-naming-spec-compliance added, make Thunar
+      xdg-compliant wrt. icon naming.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 28 Feb 2009 14:30:19 +0100
+
+thunar (0.9.0-10) unstable; urgency=low
+
+  * -dev package doesn't need to depend on exo-utils, thunar does.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 02 Jun 2008 22:52:35 +0200
+
+thunar (0.9.0-9) unstable; urgency=low
+
+  * debian/control: 
+    - don't build-conflict against gamin on hurd, where fam is not available.
+    - remove Rudy Godoy and Martin Loschwitz from Uploaders.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 17 May 2008 18:45:16 +0200
+
+thunar (0.9.0-8) unstable; urgency=low
+
+  * debian/control:
+    - move Recommends from dbus to dbus-x11 to make sure there is a session bus
+      available if user wants dbus.
+    - drop now useless conflicts/replaces.
+  * debian/rules:
+    - install .desktop files to sendto folder.
+  * debian/(bluetooth-sendto,gnome-obex-send,xfprint).desktop added, to 
+    improve Thunar “sendto” menu. Thanks Evgeni Golov.          closes: #473410
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 27 Apr 2008 16:35:45 +0200
+
+thunar (0.9.0-7) unstable; urgency=low
+
+  * upload to unstable.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 06 Apr 2008 16:59:07 +0200
+
+thunar (0.9.0-6) experimental; urgency=low
+
+  * upload to experimental due to experimental changes…
+  * debian/control: 
+    - add Homepage: field.
+    - add a note about the trash applet plugin.
+    - update conflict against thunar-data package for thunar-tpa.desktop
+  * debian/rules:
+    - add shlibdeps information for trash applet to thunar Recommends: instead
+      of Depends:.
+    - don't ship the thunar-tpa.desktop file in thunar-data.
+  * debian/thunar.install: ship thunar-tpa.desktop in thunar package.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 25 Mar 2008 12:13:11 +0100
+
+thunar (0.9.0-5) unstable; urgency=low
+
+  * debian/compat: bump debhelper compatibility to 5.
+  * debian/control:
+    - bump debhelper build-dep accordingly.
+    - add a new -dbg package containing debugging symbols.
+  * debian/libthunar-vfs-1-dev.install:
+    - there's no .a or .la generated, so no need to try to ship them.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 02 Mar 2008 01:06:27 +0100
+
+thunar (0.9.0-4) unstable; urgency=low
+
+  * debian/patches:
+    - 04_es-l10n-typo added.                                    closes: #434002
+    - 05_thunar-vfs-nozombies added, prevents thunar and xfdesktop to spawn
+      zombies. Thanks Jeremy Lal.                               closes: #465803
+  * debian/thunar.install: install .desktop files in thunar package.
+  * debian/rules: remove .desktop files from thunar-data package.
+  * debian/control: add proper conflicts against previous thunar-data.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 01 Mar 2008 13:29:40 +0100
+
+thunar (0.9.0-3) unstable; urgency=low
+
+  * loose dependency in shlibs file by removing debian part.
+  * debian/control: add dependency on exo-utils since thunar call exo-eject and
+    exo-desktop-item-edit.
+  * debian/rules: correct lintian file installation.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 28 Jan 2008 08:13:37 +0100
+
+thunar (0.9.0-2) unstable; urgency=low
+
+  * debian/control:
+    - explicitely enable options for ./configure.
+    - update standard versions.
+  * debian/patches:
+    - 03_use-eject-where-necessary added, taken from upstream. closes:  #455866
+  * debian/copyright: remove complete GFDL text and add a link to
+    common-licenses.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 12 Dec 2007 23:55:13 +0100
+
+thunar (0.9.0-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * new upstream release.
+    - ogg files now correctly detected as audio files.          closes: #446369
+    - date format is now configurable.                          closes: #392079
+  * debian/thunar.menu: switch to new menu policy.
+  * debian/control:
+    - bump build-dep to Xfce 4.4.2.
+    - add build-dep on libjpeg62-dev to build thumbnails correctly even for
+      larges images.                                            closes: #444070
+  * debian/patches:
+    - added 02_thunar-vfs-volume-hal_missing-audio-cds-for-volman.
+  * debian/copyright: updated download url.
+
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+  * Make libthunar-vfs-1-2 and -dev depend on thunar-data so their doc
+    symlinks work.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Tue, 04 Dec 2007 13:05:14 +0100
+
+thunar (0.8.0-6) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/control: build against libpcre3-dev to enable regexp in thunar mass
+    renamer.                                                    closes: #434230
+  (Simon Huggins)
+  * Fix doc symlinks in packages.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Tue, 07 Aug 2007 12:33:14 +0100
+
+thunar (0.8.0-5) unstable; urgency=low
+
+  * Upload to unstable now it's through NEW.
+
+ -- Simon Huggins <huggie@earth.li>  Wed, 27 Jun 2007 12:41:14 +0100
+
+thunar (0.8.0-4) experimental; urgency=low
+
+  * Split out the architecture independent files.
+  * Use ${binary:Version} so that we can be binNMU'd safely.
+
+ -- Simon Huggins <huggie@earth.li>  Fri, 25 May 2007 16:06:19 +0100
+
+thunar (0.8.0-3) unstable; urgency=low
+
+  * debian/control: Suggests thunar-volman
+  * debian/control: Ship README.Debian again                    closes: #415487
+
+ -- Simon Huggins <huggie@earth.li>  Tue, 22 May 2007 14:19:39 +0100
+
+thunar (0.8.0-2) unstable; urgency=low
+
+  * debian/copyright: updated copyright holders and license for documentation. 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+thunar (0.8.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+    - zn_CH translation updated.				closes: #406634
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - recommends dbus.						closes: #402419
+    - recommends gamin
+    - drop recommends on pmount as mount is now managed trough hal.
+    - build-dep against libfam-dev instead of libgamin-dev so users can then
+    choose.
+  * remove Thunar.1 from package as it's now shipped upstream. Provide a
+    symbolic link from thunar.1 to Thunar.1.
+  * debian/thunar.install: ship everything in /usr/share/
+
+  (Emanuele Rocca)
+  * Added versioned build-dep on libgtk2.0-dev (>= 2.10.1).
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 28 Jan 2007 15:50:35 +0100
+
+thunar (0.5.0rc2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: 
+    - updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+    - updated description as we don't ship a svn snapshot anymore.
+  * thunar-uca now uses terminal configured in exo-preferred-applications.
+  * ship thunar-sendto-email correctly. 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Mon, 27 Nov 2006 15:24:13 +0100
+
+thunar (0.4.0rc1-2) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * debian/control: allow building on non-linux arche by removing hal
+    build-dep on those archs (thanks Cyril Brulebois).          Closes: #389082
+  (Simon Huggins)
+  * Replace POSIX_MADV* with MADV* on archs with dodgy bits/mman.h
+                                                                Closes: #389414
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 29 Sep 2006 12:53:30 +0100
+
+thunar (0.4.0rc1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 23 Sep 2006 13:45:58 +0100
+
+thunar (0.3.2beta2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch from Terminal to xfce4-terminal in the example UCA.	Closes: #374103
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun,  9 Jul 2006 22:01:38 +0200
+
+thunar (0.3.0beta1-3) unstable; urgency=low
+
+  * Fixed menu file and manpages being in libthunar-vfs-1-dev instead of
+    thunar.
+  * Updated manpage using help2man.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 17 Jun 2006 12:36:29 +0100
+
+thunar (0.3.0beta1-2) unstable; urgency=high
+
+  (Yves-Alexis Perez)
+   * Added shared-mime-info as dependency to have correct mime types detection 
+  (Simon Huggins)
+   * Move the packages around in debian/control so the lib is built first and
+     the shlibs file gets taken into account and we get a proper versioned
+     libthunar-vfs-1-2 dep.  urgency=high to fix the stupid amd64 dependency
+     bug pbuilder left us.                                      closes: #373724
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Mon,  5 Jun 2006 17:26:39 +0200
+
+thunar (0.3.0beta1-1) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+   * New upstream release
+   * Updated help path so help page (F1) is opened correctly    closes: #362491
+  (Simon Huggins)
+   * Remove .la files all together from this package - we ship a .pc file
+     which should be sufficient for things building against it.
+   * Add dependency on libexo-dev to libthunar-vfs-1-dev.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 03 May 2006 18:35:05 +0100
+
+thunar (0.2.2alpha2-r20235-2) unstable; urgency=low
+
+  * Explicitly build without gconf dependency
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 17 Mar 2006 18:09:01 +0100
+
+thunar (0.2.2alpha2-r20235-1) unstable; urgency=low
+  
+  (Yves-Alexis Perez)
+   * New upstream (alpha2) release
+   * debian/control
+     - Build-depend on libhal-storage-dev and libdbus-glib-1-dev to enable
+     volume management in thunar (see /usr/share/doc/thunar/README.volumes)
+     - Build-depend on libgamin so thunar is informed of changes by gam
+     - Depend on desktop-file-utils so thunar can use update-desktop-database
+   * bump soname in lib package name
+   * debian/libthunar-vfs-1-2.shlibs
+     - bump soname
+   * debian/thunar.install
+     - Included thunar-uca (User Customisable Actions) in thunar package
+     - Moved locales from libthunarvfs-1 to thunar package
+     - Added html doc files
+   * debian/libthunar-vfs-1-dev.install
+     - Included gtk-doc in the dev package
+   * debian/docs
+     - Added FAQ and HACKING in the docs
+  (Simon Huggins)
+   * Don't ship the thunar-uca.la.
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Tue, 14 Mar 2006 09:50:28 +0000
+ 
+thunar (0.2.0alpha-r19548-3) unstable; urgency=low
+  
+  * Fixed versioned dependancy on libthunarvfs-1
+  * Updated exo version dependancy 				Closes: #349829
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 28 Jan 2006 16:53:33 +0000
+ 
+thunar (0.2.0alpha-r19548-2) unstable; urgency=low
+  
+  * Added pixmaps and icons to thunar package			Closes: #349758
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 25 Jan 2006 10:19:32 +0000
+ 
+thunar (0.2.0alpha-r19548-1) unstable; urgency=low
+  
+  * New Upstream (alpha) release
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 22 Jan 2006 22:26:21 +0100
+ 
+thunar (0.1.4svn+r18850-3) unstable; urgency=low
+  
+  * Added a little patch so thunar doesnt FTBFS on some arches	Closes: #345817
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Tue, 03 Jan 2006 16:09:49 +0100
+ 
+thunar (0.1.4svn+r18850-2) unstable; urgency=low
+  
+  * Added a build-dependancy on libxml-parser-perl so thunar builds in pbuilder
+  * Changed the dependancy for libthunar-vfs-1-dev to libthunar-vfs-1
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Mon, 02 Jan 2006 23:42:32 +0100
+ 
+thunar (0.1.4svn+r18850-1) unstable; urgency=low
+
+  * Initial release 						Closes: #344321
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 30 Dec 2005 18:06:29 +0100
--- thunar-1.0.2.orig/debian/libthunar-vfs-1-2.lintian-overrides
+++ thunar-1.0.2/debian/libthunar-vfs-1-2.lintian-overrides
@@ -0,0 +1,2 @@
+#private
+libthunar-vfs-1-2: package-name-doesnt-match-sonames libthunar-vfs-1-2 libthunarx-1-0
--- thunar-1.0.2.orig/debian/libthunar-vfs-1-dev.install
+++ thunar-1.0.2/debian/libthunar-vfs-1-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*
--- thunar-1.0.2.orig/debian/thunar.postinst
+++ thunar-1.0.2/debian/thunar.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
+then
+  cd /usr/share/doc/thunar && rm -f thunar-data
+fi
+
+#DEBHELPER#
+
+exit 0
--- thunar-1.0.2.orig/debian/control
+++ thunar-1.0.2/debian/control
@@ -0,0 +1,66 @@
+Source: thunar
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac@debian.org>, Emanuele Rocca <ema@debian.org>,
+ Simon Huggins <huggie@earth.li>, Lionel Le Folgoc <mrpouit@gmail.com>
+Build-Depends: debhelper (>= 7), libcairo2-dev, 
+ libexo-0.3-dev (>= 0.3.100), cdbs, libxml-parser-perl, libfam-dev, 
+ libhal-storage-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], 
+ libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), 
+ xfce4-panel-dev (>= 4.6.0), chrpath, libpcre3-dev, libjpeg-dev,
+ libstartup-notification0-dev (>= 0.4), intltool
+Build-Conflicts: libgamin-dev [!hurd-i386]
+Standards-Version: 3.8.4
+Homepage: http://thunar.xfce.org
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
+
+Package: libthunar-vfs-1-dev
+Section: libdevel
+Architecture: any
+Depends: libthunar-vfs-1-2 (= ${binary:Version}), ${misc:Depends},
+ libexo-0.3-dev (>= 0.3.100), thunar-data, libglib2.0-dev, libgtk2.0-dev
+Description: Development files for libthunar-vfs
+ This package contains the headers and the static library for libthunar-vfs, 
+ the virtual file system abstraction used by thunar
+
+Package: libthunar-vfs-1-2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, thunar-data, ${misc:Depends}
+Description: VFS abstraction used in thunar
+ This package contains a library for virtual file system abstraction. It's 
+ used by thunar, the file manager of Xfce 4.6
+
+Package: thunar
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, 
+ shared-mime-info, thunar-data (= ${source:Version}), exo-utils
+Recommends: hal, dbus-x11, gamin, ${shlibs:Recommends}, thunar-volman,
+ xdg-user-dirs
+Suggests: thunar-archive-plugin, thunar-media-tags-plugin
+Description: File Manager for Xfce
+ Thunar is the file manager designed to be the default file manager of Xfce 4.6
+ It has been designed to be fast and easy to use.
+ .
+ An Xfce plugin can manages the trash, if xfce4-panel is installed as well.
+ Please read README.Debian for volume management stuff.
+
+Package: thunar-data
+Section: xfce
+Architecture: all
+Depends: ${misc:Depends}
+Description: Provides thunar documentation, icons and translations
+ This package contains architecture-independent files for thunar.
+
+Package: thunar-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
+Description: debugging informations for thunar
+ This package contains debugging symbols for thunar, libthunar-vfs and 
+ libthunar-x, the file manager and file management libraries for Xfce Desktop
+ Environment.
--- thunar-1.0.2.orig/debian/gnome-obex-send.desktop
+++ thunar-1.0.2/debian/gnome-obex-send.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Gnome Bluetooth OBEX Recipient
+Icon=stock_mailto
+Exec=gnome-obex-send %F
+TryExec=gnome-obex-send
--- thunar-1.0.2.orig/debian/libthunar-vfs-1-2.postinst
+++ thunar-1.0.2/debian/libthunar-vfs-1-2.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
+then
+	cd /usr/share/doc/libthunar-vfs-1-2 && rm -f thunar-data
+fi
+
+#DEBHELPER#
+
+exit 0
--- thunar-1.0.2.orig/debian/watch
+++ thunar-1.0.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/src/xfce/thunar/([\d\.]+)/ \
+  Thunar-([\d\.]+)\.tar\.(?:gz|bz2)
--- thunar-1.0.2.orig/debian/patches/03_thunar-window-maximize.patch
+++ thunar-1.0.2/debian/patches/03_thunar-window-maximize.patch
@@ -0,0 +1,75 @@
+Index: thunar/thunar-preferences.c
+===================================================================
+--- thunar/thunar-preferences.c	(revision 28993)
++++ thunar/thunar-preferences.c	(working copy)
+@@ -68,6 +68,7 @@
+   PROP_LAST_VIEW,
+   PROP_LAST_WINDOW_HEIGHT,
+   PROP_LAST_WINDOW_WIDTH,
++  PROP_LAST_WINDOW_FULLSCREEN,
+   PROP_MISC_VOLUME_MANAGEMENT,
+   PROP_MISC_CASE_SENSITIVE,
+   PROP_MISC_DATE_STYLE,
+@@ -436,6 +437,20 @@
+                                                      "last-window-width",
+                                                      1, G_MAXINT, 640,
+                                                      EXO_PARAM_READWRITE));
++                                                     
++  /**
++   * ThunarPreferences:last-window-maximized:
++   *
++   * The last known maximized state of a #ThunarWindow, which will be used as
++   * default width for newly created windows.
++   **/
++  g_object_class_install_property (gobject_class,
++                                   PROP_LAST_WINDOW_FULLSCREEN,
++                                   g_param_spec_boolean ("last-window-maximized",
++                                                         "LastWindowMaximized",
++                                                         "last-window-maximized",
++                                                         FALSE,
++                                                         EXO_PARAM_READWRITE));
+ 
+   /**
+    * ThunarPreferences:misc-volume-management:
+Index: thunar/thunar-window.c
+===================================================================
+--- thunar/thunar-window.c	(revision 28993)
++++ thunar/thunar-window.c	(working copy)
+@@ -710,6 +710,7 @@
+   gint            position;
+   gint            width;
+   gint            height;
++  gboolean        maximized;
+ 
+   /* grab a reference on the provider factory */
+   window->provider_factory = thunarx_provider_factory_get_default ();
+@@ -805,8 +806,12 @@
+   g_signal_connect_swapped (G_OBJECT (window->launcher), "change-directory", G_CALLBACK (thunar_window_set_current_directory), window);
+ 
+   /* determine the default window size from the preferences */
+-  g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, NULL);
++  g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, "last-window-maximized", &maximized, NULL);
+   gtk_window_set_default_size (GTK_WINDOW (window), width, height);
++  
++  /* restore the maxized state of the window */
++  if (G_UNLIKELY (maximized))
++    gtk_window_maximize (GTK_WINDOW (window));
+ 
+   window->table = gtk_table_new (6, 1, FALSE);
+   gtk_container_add (GTK_CONTAINER (window), window->table);
+@@ -2491,8 +2496,14 @@
+               gtk_window_get_size (GTK_WINDOW (window), &width, &height);
+ 
+               /* ...and remember them as default for new windows */
+-              g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height, NULL);
++              g_object_set (G_OBJECT (window->preferences), "last-window-width", width, "last-window-height", height,
++                            "last-window-maximized", FALSE, NULL);
+             }
++          else
++            {
++              /* only store that the window is full screen */
++              g_object_set (G_OBJECT (window->preferences), "last-window-maximized", TRUE, NULL);
++            }
+         }
+     }
+ 
--- thunar-1.0.2.orig/debian/patches/07_update-cursor-on-delete.patch
+++ thunar-1.0.2/debian/patches/07_update-cursor-on-delete.patch
@@ -0,0 +1,37 @@
+From e49759d5b54c4f44c039648148c47d444ffded0f Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis@xfce.org>
+Date: Sat, 9 Jan 2010 22:36:15 +0100
+Subject: [PATCH 3/8] Properly update the cursor when a row is deleted in (bug #5361).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+When cursor and selection are out of sync weird things happen, as
+described by Jérôme in the bug comment on
+http://bugzilla.xfce.org/show_bug.cgi?id=5361.
+---
+ thunar/thunar-standard-view.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
+index 8661861..e6fb490 100644
+--- a/thunar/thunar-standard-view.c
++++ b/thunar/thunar-standard-view.c
+@@ -3019,10 +3019,12 @@ thunar_standard_view_restore_selection (ThunarListModel    *model,
+    * path is set by thunar_standard_view_row_deleted() if this is the case */
+   if (G_LIKELY (standard_view->priv->selection_before_delete != NULL))
+     {
+-      /* Restore the selection by selecting either the row before or the new
+-       * first row */
++      /* Restore the selection by selecting either the row before or the new first row */
+       (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->select_path) (standard_view, standard_view->priv->selection_before_delete);
+ 
++      /* place the cursor on the selected path */
++      (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->set_cursor) (standard_view, standard_view->priv->selection_before_delete, FALSE);
++
+       /* Free the tree path */
+       gtk_tree_path_free (standard_view->priv->selection_before_delete);
+       standard_view->priv->selection_before_delete = NULL;
+-- 
+1.6.3.3
+
--- thunar-1.0.2.orig/debian/patches/06_fix-sidepane-width.patch
+++ thunar-1.0.2/debian/patches/06_fix-sidepane-width.patch
@@ -0,0 +1,23 @@
+From 79bc169e0c90c74d21d21d3d73730001a72a2dcc Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis@xfce.org>
+Date: Fri, 18 Sep 2009 21:41:06 +0000
+Subject: Use g_utf8_strlen to calculate the sidepane width. Bugs #5390 and #3965.
+
+Using strlen() for the number of characters is unrealistic when dealing
+with multibyte strings.
+---
+diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
+index 2ba4b61..c7df182 100644
+--- a/thunar/thunar-shortcuts-view.c
++++ b/thunar/thunar-shortcuts-view.c
+@@ -274,7 +274,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
+   renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT,
+                            "ellipsize-set", TRUE,
+                            "ellipsize", PANGO_ELLIPSIZE_END,
+-                           "width-chars", strlen (_("File System")),
++                           "width-chars", g_utf8_strlen (_("File System"), -1),
+                            NULL);
+   g_signal_connect (G_OBJECT (renderer), "edited", G_CALLBACK (thunar_shortcuts_view_renamed), view);
+   gtk_tree_view_column_pack_start (column, renderer, TRUE);
+--
+cgit v0.8.2.1
--- thunar-1.0.2.orig/debian/patches/08_refilter-tree-hidden-dir.patch
+++ thunar-1.0.2/debian/patches/08_refilter-tree-hidden-dir.patch
@@ -0,0 +1,95 @@
+From 49ca1071a69776bcbff3ae987dca79e99bbca15e Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis@xfce.org>
+Date: Sun, 10 Jan 2010 14:36:11 +0100
+Subject: [PATCH 4/8] Refilter the tree model when a hidden dir is entered/left (bug #6142).
+
+What's new is that instead of only refiltering when entering a directory
+that is within a hidden hierarchy, we now do the same when leaving a
+hidden directory or directory with hidden ancestor. This makes sure
+hidden directories are properly removed from the tree view side pane
+when hidden directories are turned off, unless you're browsing them.
+---
+ thunar/thunar-tree-view.c |   47 ++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 42 insertions(+), 5 deletions(-)
+
+diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
+index 3836a32..cfe1100 100644
+--- a/thunar/thunar-tree-view.c
++++ b/thunar/thunar-tree-view.c
+@@ -535,15 +535,46 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
+                                         ThunarFile      *current_directory)
+ {
+   ThunarTreeView *view = THUNAR_TREE_VIEW (navigator);
+-  ThunarFile     *file, *file_parent;
++  ThunarFile     *file;
++  ThunarFile     *file_parent;
++  gboolean        needs_refiltering = FALSE;
+ 
+   /* check if we already use that directory */
+   if (G_UNLIKELY (view->current_directory == current_directory))
+     return;
+ 
+-  /* disconnect from the previous current directory */
++  /* check if we have an active directory */
+   if (G_LIKELY (view->current_directory != NULL))
+-    g_object_unref (G_OBJECT (view->current_directory));
++    {
++      /* update the filter if the old current directory, or one of it's parents, is hidden */
++      if (!view->show_hidden)
++        {
++          /* look if the file or one of it's parents is hidden */
++          for (file = g_object_ref (G_OBJECT (view->current_directory)); file != NULL; file = file_parent)
++            {
++              /* check if this file is hidden */
++              if (thunar_file_is_hidden (file))
++                {
++                  /* schedule an update of the filter after the current directory has been changed */
++                  needs_refiltering = TRUE;
++
++                  /* release the file */
++                  g_object_unref (G_OBJECT (file));
++
++                  break;
++                }
++            
++              /* get the file parent */
++              file_parent = thunar_file_get_parent (file, NULL);
++
++              /* release the file */
++              g_object_unref (G_OBJECT (file));
++            }
++        }
++
++      /* disconnect from the previous current directory */
++      g_object_unref (G_OBJECT (view->current_directory));
++    }
+ 
+   /* activate the new current directory */
+   view->current_directory = current_directory;
+@@ -554,8 +585,10 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
+       /* take a reference on the directory */
+       g_object_ref (G_OBJECT (current_directory));
+ 
+-      /* update the filter if the new current directory, or one of it's parents, is hidden */
+-      if (!view->show_hidden)
++      /* update the filter if the new current directory, or one of it's parents, is 
++       * hidden. we don't have to check this unless refiltering needs to be done 
++       * anyway */
++      if (!needs_refiltering && !view->show_hidden)
+         {
+           /* look if the file or one of it's parents is hidden */
+           for (file = g_object_ref (G_OBJECT (current_directory)); file != NULL; file = file_parent)
+@@ -593,6 +626,10 @@ thunar_tree_view_set_current_directory (ThunarNavigator *navigator,
+         }
+     }
+ 
++  /* refilter the model if necessary */
++  if (needs_refiltering)
++    thunar_tree_model_refilter (view->model);
++
+   /* notify listeners */
+   g_object_notify (G_OBJECT (view), "current-directory");
+ }
+-- 
+1.6.3.3
+
--- thunar-1.0.2.orig/debian/patches/01_thunar-help-directory.patch
+++ thunar-1.0.2/debian/patches/01_thunar-help-directory.patch
@@ -0,0 +1,11 @@
+--- ThunarHelp.in	2006-04-13 23:57:36.000000000 +0200
++++ ThunarHelp.in	2006-03-01 16:44:06.000000000 +0100
+@@ -19,7 +19,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-HELPDIR="@datadir@/doc/Thunar/html/"
++HELPDIR="@datadir@/doc/thunar/html/"
+ 
+ if test -n "$LC_ALL"; then
+   LC=$LC_ALL
--- thunar-1.0.2.orig/debian/patches/05_fix-crash-drag-gdk-none.patch
+++ thunar-1.0.2/debian/patches/05_fix-crash-drag-gdk-none.patch
@@ -0,0 +1,25 @@
+From 58568697a90844d98c7602902df8084297f19c1b Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis@xfce.org>
+Date: Sun, 20 Dec 2009 13:42:21 +0000
+Subject: Avoid requesting drag data if target is GDK_NONE (bug #5771).
+
+Patch provided by k.blammo@gmail.com.
+
+Ported to thunar 1.0.1 for Xubuntu/Debian.
+---
+diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
+index 83139fc..8661861 100644
+--- a/thunar/thunar-standard-view.c
++++ b/thunar/thunar-standard-view.c
+@@ -2857,7 +2858,8 @@ thunar_standard_view_drag_motion (GtkWidget          *view,
+       else
+         {
+           /* request the drag data from the source */
+-          gtk_drag_get_data (view, context, target, time);
++          if (target != GDK_NONE)
++            gtk_drag_get_data (view, context, target, time);
+         }
+ 
+       /* tell Gdk whether we can drop here */
+--
+cgit v0.8.2.1
--- thunar-1.0.2.orig/debian/patches/02_thunar-icon-naming-spec-compliance.patch
+++ thunar-1.0.2/debian/patches/02_thunar-icon-naming-spec-compliance.patch
@@ -0,0 +1,441 @@
+diff --git a/plugins/thunar-tpa/thunar-tpa-icon.c b/plugins/thunar-tpa/thunar-tpa-icon.c
+index da38304..740000a 100644
+--- a/plugins/thunar-tpa/thunar-tpa-icon.c
++++ b/plugins/thunar-tpa/thunar-tpa-icon.c
+@@ -175,7 +175,7 @@ thunar_tpa_icon_init (ThunarTpaIcon *icon)
+   gtk_widget_show (icon->button);
+ 
+   /* setup the image for the trash icon */
+-  icon->image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
++  icon->image = gtk_image_new_from_icon_name ("user-trash", GTK_ICON_SIZE_BUTTON);
+   gtk_container_add (GTK_CONTAINER (icon->button), icon->image);
+   gtk_widget_show (icon->image);
+ 
+@@ -287,7 +287,7 @@ thunar_tpa_icon_state (ThunarTpaIcon *icon,
+   gtk_tooltips_set_tip (icon->tooltips, icon->button, full ? _("Trash contains files") : _("Trash is empty"), NULL);
+ 
+   /* setup the appropriate icon */
+-  gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "gnome-fs-trash-full" : "gnome-fs-trash-empty", GTK_ICON_SIZE_BUTTON);
++  gtk_image_set_from_icon_name (GTK_IMAGE (icon->image), full ? "user-trash-full" : "user-trash", GTK_ICON_SIZE_BUTTON);
+ 
+   /* apply the new state */
+   icon->full = full;
+diff --git a/plugins/thunar-tpa/thunar-tpa.desktop.in.in b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
+index 6d848f6..f647521 100644
+--- a/plugins/thunar-tpa/thunar-tpa.desktop.in.in
++++ b/plugins/thunar-tpa/thunar-tpa.desktop.in.in
+@@ -3,6 +3,6 @@ Type=X-XFCE-PanelPlugin
+ Encoding=UTF-8
+ _Name=Trash Applet
+ _Comment=Display the trash can
+-Icon=gnome-fs-trash-empty
++Icon=user-trash
+ X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/thunar-tpa
+ 
+diff --git a/thunar-vfs/thunar-vfs-io-local.c b/thunar-vfs/thunar-vfs-io-local.c
+index 615a36c..e2d75e7 100644
+--- a/thunar-vfs/thunar-vfs-io-local.c
++++ b/thunar-vfs/thunar-vfs-io-local.c
+@@ -390,7 +390,7 @@ _thunar_vfs_io_local_get_info (ThunarVfsPath *path,
+       if (G_UNLIKELY (filename[0] == G_DIR_SEPARATOR && filename[1] == '\0'))
+         {
+           /* root folder gets a special custom icon... */
+-          info->custom_icon = g_strdup ("gnome-dev-harddisk");
++          info->custom_icon = g_strdup ("drive-harddisk");
+ 
+           /* ...and a special display name */
+           info->display_name = g_strdup (_("File System"));
+diff --git a/thunar-vfs/thunar-vfs-io-trash.c b/thunar-vfs/thunar-vfs-io-trash.c
+index 8ca0370..29f333d 100644
+--- a/thunar-vfs/thunar-vfs-io-trash.c
++++ b/thunar-vfs/thunar-vfs-io-trash.c
+@@ -1119,7 +1119,7 @@ _thunar_vfs_io_trash_get_info (ThunarVfsPath *path,
+       info->ctime = mtime;
+       info->mime_info = thunar_vfs_mime_info_ref (_thunar_vfs_mime_inode_directory);
+       info->path = thunar_vfs_path_ref (_thunar_vfs_path_trash_root);
+-      info->custom_icon = g_strdup (empty ? "gnome-fs-trash-empty" : "gnome-fs-trash-full");
++      info->custom_icon = g_strdup (empty ? "user-trash" : "user-trash-full");
+       info->display_name = g_strdup (_("Trash"));
+       info->ref_count = 1;
+     }
+diff --git a/thunar-vfs/thunar-vfs-mime-info.c b/thunar-vfs/thunar-vfs-mime-info.c
+index 7c8fe0c..c3c07e1 100644
+--- a/thunar-vfs/thunar-vfs-mime-info.c
++++ b/thunar-vfs/thunar-vfs-mime-info.c
+@@ -47,18 +47,18 @@ static const struct
+   const gchar icon[19];
+ } GNOME_INODE_ICONNAMES[] =
+ {
+-  { "blockdevice", "gnome-fs-blockdev"  },
+-  { "chardevice",  "gnome-fs-chardev"   },
+-  { "directory",   "gnome-fs-directory" },
+-  { "fifo",        "gnome-fs-fifo"      },
+-  { "socket",      "gnome-fs-socket"    },
++  { "blockdevice", "inode-blockdev"  },
++  { "chardevice",  "inode-chardev"   },
++  { "directory",   "folder" },
++  { "fifo",        "inode-fifo"      },
++  { "socket",      "inode-socket"    },
+ };
+ 
+ /* first fallback gnome icon name */
+ static const gchar GNOME_FS_REGULAR[] = "gnome-fs-regular";
+ 
+ /* second fallback gnome icon name */
+-static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "gnome-mime-application-octet-stream";
++static const gchar GNOME_MIME_APPLICATION_OCTET_STREAM[] = "application-x-executable";
+ 
+ /* generic standard icon names (Icon Naming Spec 0.8) */
+ static const gchar XDG_GENERIC_ICONNAMES[][18] =
+diff --git a/thunar-vfs/thunar-vfs-volume.c b/thunar-vfs/thunar-vfs-volume.c
+index 95bdc99..9d5661d 100644
+--- a/thunar-vfs/thunar-vfs-volume.c
++++ b/thunar-vfs/thunar-vfs-volume.c
+@@ -398,83 +398,76 @@ thunar_vfs_volume_lookup_icon_name (ThunarVfsVolume *volume,
+   kind = thunar_vfs_volume_get_kind (volume);
+   switch (kind)
+     {
+-cdrom:
+-    case THUNAR_VFS_VOLUME_KIND_CDROM:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom"))
+-        return "gnome-dev-cdrom";
+-      break;
+-
+-    case THUNAR_VFS_VOLUME_KIND_CDR:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdr"))
+-        return "gnome-dev-disc-cdr";
+-      goto cdrom;
+-
+-    case THUNAR_VFS_VOLUME_KIND_CDRW:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-cdrw"))
+-        return "gnome-dev-disc-cdrw";
+-      goto cdrom;
+-
+-dvdrom:
+-    case THUNAR_VFS_VOLUME_KIND_DVDROM:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrom"))
+-        return "gnome-dev-disc-dvdrom";
+-      else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-dvd"))
+-        return "gnome-dev-dvd";
+-      goto cdrom;
+-
+-    case THUNAR_VFS_VOLUME_KIND_DVDRAM:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdram"))
+-        return "gnome-dev-disc-dvdram";
++    case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw-plus"))
++        return "media-optical-dvd-rw-plus";
++    case THUNAR_VFS_VOLUME_KIND_DVDRW:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-rw"))
++        return "media-optical-dvd-rw";
+       goto dvdrom;
+-
+-dvdr:
++    case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r-plus"))
++        return "media-optical-dvd-r-plus";
+     case THUNAR_VFS_VOLUME_KIND_DVDR:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr"))
+-        return "gnome-dev-disc-dvdr";
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-r"))
++        return "media-optical-dvd-r";
+       goto dvdrom;
+-
+-    case THUNAR_VFS_VOLUME_KIND_DVDRW:
+-    case THUNAR_VFS_VOLUME_KIND_DVDPLUSRW:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdrw"))
+-        return "gnome-dev-disc-dvdrw";
++    case THUNAR_VFS_VOLUME_KIND_DVDRAM:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd-ram"))
++        return "media-optical-dvd-ram";
+       goto dvdrom;
+-
+-    case THUNAR_VFS_VOLUME_KIND_DVDPLUSR:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-disc-dvdr-plus"))
+-        return "gnome-dev-disc-dvdr-plus";
+-      goto dvdr;
++dvdrom:
++    case THUNAR_VFS_VOLUME_KIND_DVDROM:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-dvd"))
++        return "media-optical-dvd";
++      goto optical;
++      
++    case THUNAR_VFS_VOLUME_KIND_CDRW:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-rw"))
++        return "media-optical-cd-rw";
++      goto cdrom;
++    case THUNAR_VFS_VOLUME_KIND_CDR:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd-r"))
++        return "media-optical-cd-r";
++      goto cdrom;
++cdrom:
++    case THUNAR_VFS_VOLUME_KIND_CDROM:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-cd"))
++        return "media-optical-cd";
++      goto optical;
++    case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical-audio"))
++        return "media-optical-audio";
++      goto optical;
++optical:
++      if (gtk_icon_theme_has_icon (icon_theme, "media-optical"))
++        return "media-optical";
++      break;
+ 
+     case THUNAR_VFS_VOLUME_KIND_FLOPPY:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-floppy"))
+-        return "gnome-dev-floppy";
++      if (gtk_icon_theme_has_icon (icon_theme, "media-floppy"))
++        return "media-floppy";
+       break;
+-
+     case THUNAR_VFS_VOLUME_KIND_HARDDISK:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk"))
+-        return "gnome-dev-harddisk";
++      if (gtk_icon_theme_has_icon (icon_theme, "drive-harddisk"))
++        return "drive-harddisk";
+       break;
+ 
+     case THUNAR_VFS_VOLUME_KIND_USBSTICK:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable-usb"))
+-        return "gnome-dev-removable-usb";
+-      else if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-harddisk-usb"))
+-        return "gnome-dev-harddisk-usb";
+-      break;
+-
++      if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-usb"))
++        return "drive-removable-media-usb";
++      goto removable_media;
+     case THUNAR_VFS_VOLUME_KIND_AUDIO_PLAYER:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-ipod"))
+-        return "gnome-dev-ipod";
+-      break;
++      if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media-ipod"))
++        return "drive-removable-media-ipod";
++      goto removable_media;
+ 
+-    case THUNAR_VFS_VOLUME_KIND_AUDIO_CD:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom-audio"))
+-        return "gnome-dev-cdrom-audio";
+-      goto cdrom;
+       
+     case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
+     case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
+-      if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable"))
+-        return "gnome-dev-removable";
++removable_media:
++      if (gtk_icon_theme_has_icon (icon_theme, "drive-removable-media"))
++        return "drive-removable-media";
+       break;
+ 
+     default:
+diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
+index c30d43a..80c9784 100644
+--- a/thunar/thunar-application.c
++++ b/thunar/thunar-application.c
+@@ -1166,7 +1166,7 @@ thunar_application_copy_to (ThunarApplication *application,
+   _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ 
+   /* launch the operation */
+-  thunar_application_launch (application, parent, "stock_folder-copy",
++  thunar_application_launch (application, parent, "gtk-copy",
+                              _("Copying files..."), thunar_vfs_copy_files,
+                              source_path_list, target_path_list, new_files_closure);
+ }
+@@ -1199,7 +1199,7 @@ thunar_application_copy_into (ThunarApplication *application,
+   _thunar_return_if_fail (target_path != NULL);
+ 
+   /* collect the target paths and launch the job */
+-  thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
++  thunar_application_collect_and_launch (application, parent, "gtk-copy",
+                                          _("Copying files..."), thunar_vfs_copy_files,
+                                          source_path_list, target_path, new_files_closure);
+ }
+@@ -1233,7 +1233,7 @@ thunar_application_link_into (ThunarApplication *application,
+   _thunar_return_if_fail (target_path != NULL);
+ 
+   /* collect the target paths and launch the job */
+-  thunar_application_collect_and_launch (application, parent, "stock_link",
++  thunar_application_collect_and_launch (application, parent, "insert-link",
+                                          _("Creating symbolic links..."),
+                                          thunar_vfs_link_files, source_path_list,
+                                          target_path, new_files_closure);
+@@ -1273,12 +1273,15 @@ thunar_application_move_into (ThunarApplication *application,
+   /* determine the appropriate message text and the icon based on the target_path */
+   if (thunar_vfs_path_get_scheme (target_path) == THUNAR_VFS_PATH_SCHEME_TRASH)
+     {
+-      icon = "gnome-fs-trash-full";
++      icon = "user-trash-full";
+       text = _("Moving files into the trash...");
+     }
+   else
+     {
+-      icon = "stock_folder-move";
++      /* What kind of icon-name should we use according to the 
++       * icon-naming-spec?
++       */
++      icon = "folder-move";
+       text = _("Moving files...");
+     }
+ 
+@@ -1393,7 +1396,7 @@ thunar_application_unlink_files (ThunarApplication *application,
+       if (G_LIKELY (response == GTK_RESPONSE_YES))
+         {
+           /* launch the "Delete" operation */
+-          thunar_application_launch (application, parent, "stock_delete",
++          thunar_application_launch (application, parent, "edit-delete",
+                                       _("Deleting files..."), unlink_stub,
+                                       path_list, path_list, NULL);
+         }
+@@ -1445,7 +1448,7 @@ thunar_application_creat (ThunarApplication *application,
+   _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ 
+   /* launch the operation */
+-  thunar_application_launch (application, parent, "stock_new",
++  thunar_application_launch (application, parent, "document-new",
+                              _("Creating files..."), creat_stub,
+                              path_list, path_list, new_files_closure);
+ }
+@@ -1485,7 +1488,7 @@ thunar_application_mkdir (ThunarApplication *application,
+   _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ 
+   /* launch the operation */
+-  thunar_application_launch (application, parent, "stock_folder",
++  thunar_application_launch (application, parent, "folder-new",
+                              _("Creating directories..."), mkdir_stub,
+                              path_list, path_list, new_files_closure);
+ }
+@@ -1549,7 +1552,7 @@ thunar_application_empty_trash (ThunarApplication *application,
+       path_list.prev = NULL;
+ 
+       /* launch the operation */
+-      thunar_application_launch (application, parent, "gnome-fs-trash-empty",
++      thunar_application_launch (application, parent, "user-trash",
+                                   _("Emptying the Trash..."),
+                                   unlink_stub, &path_list, NULL, NULL);
+ 
+@@ -1685,7 +1688,7 @@ thunar_application_restore_files (ThunarApplication *application,
+   else if (G_LIKELY (response == GTK_RESPONSE_YES))
+     {
+       /* launch the operation */
+-      thunar_application_launch (application, parent, "stock_folder-move",
++      thunar_application_launch (application, parent, "folder-move",
+                                  _("Restoring files..."), thunar_vfs_move_files,
+                                  source_path_list, target_path_list, new_files_closure);
+     }
+diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
+index 0e36ee3..570efbe 100644
+--- a/thunar/thunar-dialogs.c
++++ b/thunar/thunar-dialogs.c
+@@ -602,7 +602,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow     *parent,
+   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
+   gtk_widget_show (table);
+ 
+-  image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
++  image = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_BUTTON);
+   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+   gtk_misc_set_padding (GTK_MISC (image), 6, 6);
+   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
+index 4fb278c..ddf0a64 100644
+--- a/thunar/thunar-dnd.c
++++ b/thunar/thunar-dnd.c
+@@ -68,7 +68,7 @@ thunar_dnd_ask (GtkWidget    *widget,
+ {
+   static const GdkDragAction dnd_action_items[] = { GDK_ACTION_COPY, GDK_ACTION_MOVE, GDK_ACTION_LINK };
+   static const gchar        *dnd_action_names[] = { N_ ("_Copy here"), N_ ("_Move here"), N_ ("_Link here") };
+-  static const gchar        *dnd_action_icons[] = { "stock_folder-copy", "stock_folder-move", NULL };
++  static const gchar        *dnd_action_icons[] = { "gtk-copy", "folder-move", NULL };
+ 
+   ThunarxProviderFactory *factory;
+   GdkDragAction           dnd_action = 0;
+diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
+index c049213..45063fe 100644
+--- a/thunar/thunar-file.c
++++ b/thunar/thunar-file.c
+@@ -1619,16 +1619,16 @@ thunar_file_get_icon_name (const ThunarFile   *file,
+ 
+   /* special icon for the home node */
+   if (G_UNLIKELY (thunar_file_is_home (file))
+-      && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-home"))
++      && gtk_icon_theme_has_icon (icon_theme, "user-home"))
+     {
+-      return "gnome-fs-home";
++      return "user-home";
+     }
+ 
+   /* special icon for the desktop node */
+   if (G_UNLIKELY (thunar_file_is_desktop (file))
+-      && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-desktop"))
++      && gtk_icon_theme_has_icon (icon_theme, "user-desktop"))
+    {
+-     return "gnome-fs-desktop";
++     return "user-desktop";
+    }
+ 
+   /* try to be smart when determining icons for executable files
+@@ -1648,10 +1648,10 @@ thunar_file_get_icon_name (const ThunarFile   *file,
+ 
+   /* check if we have an accept icon for the icon we found */
+   if ((icon_state == THUNAR_FILE_ICON_STATE_DROP || icon_state == THUNAR_FILE_ICON_STATE_OPEN)
+-      && strcmp (icon_name, "gnome-fs-directory") == 0
+-      && gtk_icon_theme_has_icon (icon_theme, "gnome-fs-directory-accept"))
++      && strcmp (icon_name, "folder") == 0
++      && gtk_icon_theme_has_icon (icon_theme, "folder-drag-accept"))
+     {
+-      return "gnome-fs-directory-accept";
++      return "folder-drag-accept";
+     }
+ 
+   return icon_name;
+diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
+index 0cdbe03..22630cd 100644
+--- a/thunar/thunar-icon-factory.c
++++ b/thunar/thunar-icon-factory.c
+@@ -1036,7 +1036,7 @@ again:
+       if (G_UNLIKELY (thumb_state == THUNAR_FILE_THUMB_STATE_LOADING))
+         {
+           /* check if the icon theme supports the loading icon */
+-          icon = thunar_icon_factory_lookup_icon (factory, "gnome-fs-loading-icon", icon_size, FALSE);
++          icon = thunar_icon_factory_lookup_icon (factory, "image-loading", icon_size, FALSE);
+           if (G_LIKELY (icon != NULL))
+             return icon;
+         }
+diff --git a/thunar/thunar-stock.c b/thunar/thunar-stock.c
+index 9586ed1..c777b5f 100644
+--- a/thunar/thunar-stock.c
++++ b/thunar/thunar-stock.c
+@@ -45,12 +45,12 @@ typedef struct
+ /* keep in sync with thunar-stock.h */
+ static const ThunarStockIcon thunar_stock_icons[] =
+ {
+-  { THUNAR_STOCK_DESKTOP,     "gnome-fs-desktop",       },
+-  { THUNAR_STOCK_HOME,        "gnome-fs-home",          },
++  { THUNAR_STOCK_DESKTOP,     "user-desktop",       },
++  { THUNAR_STOCK_HOME,        "user-home",          },
+   { THUNAR_STOCK_SHORTCUTS,   "stock_thunar-shortcuts", },
+-  { THUNAR_STOCK_TEMPLATES,   "stock_thunar-templates", },
+-  { THUNAR_STOCK_TRASH_EMPTY, "gnome-fs-trash-empty",   },
+-  { THUNAR_STOCK_TRASH_FULL,  "gnome-fs-trash-full",    },
++  { THUNAR_STOCK_TEMPLATES,   "text-x-generic-template", },
++  { THUNAR_STOCK_TRASH_EMPTY, "user-trash",   },
++  { THUNAR_STOCK_TRASH_FULL,  "user-trash-full",    },
+   { THUNAR_STOCK_DOWNLOADS,   "emblem-downloads",       },
+   { THUNAR_STOCK_DOCUMENTS,   "emblem-documents",       },
+   { THUNAR_STOCK_MUSIC,       "audio-x-generic",        },
+diff --git a/thunar/thunar-stock.h b/thunar/thunar-stock.h
+index 775b3e0..3f0b937 100644
+--- a/thunar/thunar-stock.h
++++ b/thunar/thunar-stock.h
+@@ -26,9 +26,9 @@ G_BEGIN_DECLS;
+ #define THUNAR_STOCK_HOME         "thunar-home"         /* see ThunarWindow */
+ #define THUNAR_STOCK_SHORTCUTS    "thunar-shortcuts"    /* see ThunarShortcutsPane */
+ #define THUNAR_STOCK_TEMPLATES    "thunar-templates"    /* see ThunarWindow */
+-#define THUNAR_STOCK_TRASH_EMPTY  "thunar-trash-empty"  /* see ThunarTrashAction */
++#define THUNAR_STOCK_TRASH_EMPTY  "thunar-trash"  /* see ThunarTrashAction */
+ #define THUNAR_STOCK_TRASH_FULL   "thunar-trash-full"   /* see ThunarTrashAction */
+-#define THUNAR_STOCK_DIRECTORY    "gnome-fs-directory"
++#define THUNAR_STOCK_DIRECTORY    "gtk-directory"
+ #define THUNAR_STOCK_DOWNLOADS    "thunar-downloads"
+ #define THUNAR_STOCK_DOCUMENTS    "thunar-documents"
+ #define THUNAR_STOCK_MUSIC        "thunar-music"