debian/0000775000000000000000000000000012321171357007172 5ustar debian/watch0000664000000000000000000000014212321167735010225 0ustar version=3 http://archive.xfce.org/src/xfce/thunar/([\d\.]+)/ \ Thunar-([\d\.]+)\.tar\.(?:gz|bz2) debian/thunar.postinst0000775000000000000000000000025012321167735012305 0ustar #!/bin/sh set -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 debian/thunar.menu0000664000000000000000000000024412321167735011366 0ustar ?package(thunar):needs="X11" section="Applications/File Management"\ title="Thunar" longtitle="Xfce4 File Manager" hints="File manager" command="/usr/bin/thunar" debian/thunar.manpages0000664000000000000000000000002012321167735012205 0ustar debian/thunar.1 debian/thunar.install0000664000000000000000000000033012321167735012064 0ustar usr/bin/* usr/lib/*/Thunar/* usr/share/applications/* usr/share/man usr/lib/*/xfce4/panel/plugins/libthunar-tpa.so usr/share/xfce4/panel-plugins/thunar-tpa.desktop usr/share/Thunar/sendto/thunar-sendto-email.desktop debian/thunar.10000664000000000000000000000002212321167735010554 0ustar .so man1/Thunar.1 debian/thunar-data.install0000664000000000000000000000033112321167735012774 0ustar etc/* usr/share/dbus-1 usr/share/doc usr/share/gtk-doc usr/share/icons usr/share/locale usr/share/pixmaps debian/bluetooth-sendto.desktop usr/share/Thunar/sendto debian/gnome-obex-send.desktop usr/share/Thunar/sendto debian/thunar-data.docs0000664000000000000000000000010112321167735012251 0ustar debian/README.Debian FAQ HACKING AUTHORS NEWS README THANKS TODO debian/rules0000775000000000000000000000337012321167735010262 0ustar #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs export DEB_BUILD_MAINT_OPTIONS=hardening=+all DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh $@ --parallel --with autoreconf override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf xdt-autogen override_dh_auto_configure: dh_auto_configure -- \ --docdir=\$${prefix}/share/doc/thunar-data \ --disable-silent-rules \ --enable-dbus --enable-startup-notification --enable-apr-plugin \ --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin \ --enable-uca-plugin override_dh_install: rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*/*.la # rpath chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/Thunar/thunar-* \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libthunar*.so.*0 \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/thunar-apr.so \ $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so dh_install --fail-missing -X usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.la override_dh_installdocs: dh_installdocs -p libthunarx-2-dev -p libthunarx-2-0 -p thunar --link-doc=thunar-data dh_installdocs --remaining-packages override_dh_strip: dh_strip --dbg-package=thunar-dbg override_dh_shlibdeps: dh_shlibdeps -X debian/thunar/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so -- \ -dRecommends debian/thunar/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libthunar-tpa.so -dDepends override_dh_makeshlibs: dh_makeshlibs -p libthunarx-2-0 -X debian/libthunarx-2-0/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2 debian/libthunarx-2-dev.install0000664000000000000000000000006612321167735013664 0ustar usr/include/* usr/lib/*/lib*.so usr/lib/*/pkgconfig/* debian/libthunarx-2-0.symbols0000664000000000000000000000475612321167735013301 0ustar libthunarx-2.so.0 libthunarx-2-0 #MINVER# thunarx_check_version@Base 1.1.0 thunarx_file_info_changed@Base 1.1.0 thunarx_file_info_get_file_info@Base 1.1.0 thunarx_file_info_get_filesystem_info@Base 1.1.0 thunarx_file_info_get_location@Base 1.1.0 thunarx_file_info_get_mime_type@Base 1.1.0 thunarx_file_info_get_name@Base 1.1.0 thunarx_file_info_get_parent_uri@Base 1.1.0 thunarx_file_info_get_type@Base 1.1.0 thunarx_file_info_get_uri@Base 1.1.0 thunarx_file_info_get_uri_scheme@Base 1.1.0 thunarx_file_info_has_mime_type@Base 1.1.0 thunarx_file_info_is_directory@Base 1.1.0 thunarx_file_info_list_copy@Base 1.1.0 thunarx_file_info_list_free@Base 1.1.0 thunarx_file_info_list_get_type@Base 1.1.0 thunarx_file_info_renamed@Base 1.1.0 thunarx_major_version@Base 1.1.0 thunarx_menu_provider_get_dnd_actions@Base 1.1.0 thunarx_menu_provider_get_file_actions@Base 1.1.0 thunarx_menu_provider_get_folder_actions@Base 1.1.0 thunarx_menu_provider_get_type@Base 1.1.0 thunarx_micro_version@Base 1.1.0 thunarx_minor_version@Base 1.1.0 thunarx_preferences_provider_get_actions@Base 1.1.0 thunarx_preferences_provider_get_type@Base 1.1.0 thunarx_property_page_get_label@Base 1.1.0 thunarx_property_page_get_label_widget@Base 1.1.0 thunarx_property_page_get_type@Base 1.1.0 thunarx_property_page_new@Base 1.1.0 thunarx_property_page_new_with_label_widget@Base 1.1.0 thunarx_property_page_provider_get_pages@Base 1.1.0 thunarx_property_page_provider_get_type@Base 1.1.0 thunarx_property_page_set_label@Base 1.1.0 thunarx_property_page_set_label_widget@Base 1.1.0 thunarx_provider_factory_get_default@Base 1.1.0 thunarx_provider_factory_get_type@Base 1.1.0 thunarx_provider_factory_list_providers@Base 1.1.0 thunarx_provider_plugin_add_interface@Base 1.1.0 thunarx_provider_plugin_get_resident@Base 1.1.0 thunarx_provider_plugin_get_type@Base 1.1.0 thunarx_provider_plugin_register_enum@Base 1.1.0 thunarx_provider_plugin_register_flags@Base 1.1.0 thunarx_provider_plugin_register_type@Base 1.1.0 thunarx_provider_plugin_set_resident@Base 1.1.0 thunarx_renamer_changed@Base 1.1.0 thunarx_renamer_get_actions@Base 1.1.0 thunarx_renamer_get_help_url@Base 1.1.0 thunarx_renamer_get_name@Base 1.1.0 thunarx_renamer_get_type@Base 1.1.0 thunarx_renamer_load@Base 1.1.0 thunarx_renamer_process@Base 1.1.0 thunarx_renamer_provider_get_renamers@Base 1.1.0 thunarx_renamer_provider_get_type@Base 1.1.0 thunarx_renamer_save@Base 1.1.0 thunarx_renamer_set_help_url@Base 1.1.0 thunarx_renamer_set_name@Base 1.1.0 debian/libthunarx-2-0.install0000664000000000000000000000005212321167735013240 0ustar usr/lib/*/lib*.so.* usr/lib/*/thunarx-2/* debian/gnome-obex-send.desktop0000664000000000000000000000020712321167735013560 0ustar [Desktop Entry] Type=Application Name=Gnome Bluetooth OBEX Recipient Icon=stock_mailto Exec=gnome-obex-send %F TryExec=gnome-obex-send debian/copyright0000664000000000000000000000371512321167735011140 0ustar This package was debianized by Yves-Alexis Perez on Thu, 17 Nov 2005 13:48:54 +0100. It was downloaded from http://thunar.xfce.org/ Copyright Holders: ================== © 2004-2007 Benedikt Meurer © 2005 Jeffs Franks © 2005-2006 Christian Hammond © 2006 Matt McClinch © 2009-2010 Jannis Pohlmann Plugins are copyrighted: © 2005-2007 Benedikt Meurer © 2008 Stephan Arts © 2008-2009 Mike Massonnet © 2009 Jannis Pohlmann © 2007-2010 Nick Schermer thunarx is copyrighted: © 2004 The GLib Development Team. © 2005-2006 Benedikt Meurer © 2009 Jannis Pohlmann tdb (trivial database system) is copyrighted: © 2001 Anton Blanchard © 2005 Benedikt Meurer © 1999-2004 Andrew Tridgell © 2000 Paul `Rusty' Russel © 2000-2003 Jeremy Allison © 2001 Andrew Esh Licenses: ========= GNU/LGPL for files under thunarx and 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' debian/control0000664000000000000000000000541412321167735010606 0ustar Source: thunar Section: xfce Priority: optional Maintainer: Xubuntu Developers XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), libexo-1-dev (>= 0.10.0), libxml-parser-perl, libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath, libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool, libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libnotify-dev, libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.10.0), dh-autoreconf, xfce4-dev-tools, gtk-doc-tools Standards-Version: 3.9.3 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: libthunarx-2-dev Section: libdevel Architecture: any Depends: libthunarx-2-0 (= ${binary:Version}), ${misc:Depends}, thunar-data (=${source:Version}), libglib2.0-dev, libgtk2.0-dev Description: Development files for libthunarx This package contains the headers and the static library for libthunarx, the extension library used by thunar Package: libthunarx-2-0 Section: libs Architecture: any Pre-depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, thunar-data (= ${source:Version}), ${misc:Depends} Description: extension library for thunar This package contains the Thunar extension library which permits adding new features to the Thunar file manager. Package: thunar Section: xfce Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version}), exo-utils Recommends: dbus-x11, ${shlibs:Recommends}, thunar-volman [linux-any], tumbler, xdg-user-dirs, gvfs, udisks2 Suggests: thunar-archive-plugin, thunar-media-tags-plugin Breaks: thunar-data (<< 1.2.3-3) Replaces: thunar-data (<< 1.2.3-3) 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 and libthunarx, the file manager and file management libraries for Xfce Desktop Environment. debian/compat0000664000000000000000000000000212321167735010375 0ustar 9 debian/changelog0000664000000000000000000010255612321167735011062 0ustar thunar (1.6.3-1ubuntu5) trusty; urgency=medium * Add git-save-keyboard-shortcuts.patch. LP: #1186846 - Keyboard shortcuts save when changed rather than when thunar is closed * Add menu-icon-tweaks.patch. LP: #1271861 - Don't use generic folder icons for open with default application - Add icons for open in new tab, new window * Add git-force-toolbr-icons.patch - Fix for "Home" and "Open Parent" icons going missing from toolbar -- Jackson Doak Sat, 05 Apr 2014 08:22:40 +1100 thunar (1.6.3-1ubuntu4) trusty; urgency=medium * Update gtk3-bookmarks.patch. LP: #1280641 Thanks Alistair Buxton -- Jackson Doak Thu, 13 Mar 2014 07:53:06 +1100 thunar (1.6.3-1ubuntu3) trusty; urgency=medium * Add git-xfdesktop-4.11.patch. LP: #1277149 * Add gtk3-bookmarks.patch, use new gtk3 bookmark location -- Jackson Doak Fri, 07 Feb 2014 16:54:48 +1100 thunar (1.6.3-1ubuntu2) trusty; urgency=medium * Use dh-autoreconf and xdt-autogen to update libtool.m4 for new ports. -- Colin Watson Thu, 26 Dec 2013 22:09:24 +0000 thunar (1.6.3-1ubuntu1) saucy; urgency=low * Merge from Debian unstable (LP: #1212905), remaining changes: - debian/control: recommend udisks2 for mounting devices. lp: #1014632 -- Sean Davis Thu, 15 Aug 2013 21:37:17 -0400 thunar (1.6.3-1) unstable; urgency=low * New upstream release. * Upload to unstable. * debian/rules: - enable verbose build so blhc can extract information from the log. - don't disable dh_auto_test anymore. - enable all hardening flags. -- Yves-Alexis Perez Tue, 21 May 2013 23:55:06 +0200 thunar (1.6.2-1) experimental; urgency=low * New upstream stable release. -- Yves-Alexis Perez Sun, 30 Dec 2012 20:40:59 +0100 thunar (1.6.2-0ubuntu1) raring; urgency=low * New upstream stable release. -- Lionel Le Folgoc Sun, 30 Dec 2012 13:43:31 +0100 thunar (1.6.1-1ubuntu1) raring; urgency=low * Merge from Debian experimental, remaining Ubuntu change: - debian/control: recommend udisks2 for mounting devices. lp: #1014632 -- Lionel Le Folgoc Thu, 13 Dec 2012 23:46:48 +0100 thunar (1.6.1-1) experimental; urgency=low [ Lionel Le Folgoc ] * Drop the "Send to printer" action, xfprint4 is obsolete. * debian/control: - dropped libtdb-dev from b-deps, emblems have been moved to gvfs. - bumped minimum required exo version to 0.10.0 for the new symbol. [ Yves-Alexis Perez ] * New upstream release. -- Yves-Alexis Perez Tue, 11 Dec 2012 21:56:56 +0100 thunar (1.6.0-0ubuntu1) raring; urgency=low * Upload to raring. * Remaining Ubuntu change: - debian/control: recommend udisks2 for mounting devices. lp: #1014632 * Drop obsolete Ubuntu changes: - debian/patches/02_guard-for-no-supported-vfs-schemas.patch, debian/patches/xubuntu_fix-duplicate-volumes.patch: included upstream. * Bugs fixed: - "Thunar: sendto_printer broken" lp: #1061846 - "segfault when a specific html file is selected" lp: #751739 - "can't book mark remote shares" lp: #778268 - "Thunar crashed with SIGSEGV in thunarx_menu_provider_get_file_actions() thinking a directory was a file" lp: #852410 - "Left or right-clicking on 3MB or bigger svg file is unresponsive" lp: #893330 - "Thunar crashed with SIGSEGV in fast_validate()" lp: #913041 - "Thunar crashed with SIGSEGV in thunar_file_get_display_name()" lp: #931101 - "Thunar crashed with SIGSEGV in sort_by_mime_type()" lp: #931842 - "Thunar crashed with SIGSEGV in thunar_util_parse_parent()" lp: #969222 - "thunar crashed with SIGSEGV in thunar_standard_view_cancel_thumbnailing()" lp: #1059397 - "Does not unmount USB drive when you try first time" lp: #1059997 - "regression: thunar no longer shows all unmounted, but mountable, volumes in sidepane" lp: #1068947 - "Thunar shows folder sizes wrong" lp: #59235 - "Right-click "Open With" list not refreshing" lp: #107392 - "no thunar contextmenu with GTK setting "gtk-menu-popup-delay = 0"" lp: #127372 - "rename folder, still active but answers not on 'Enter'" lp: #479975 - "Thunar hangs on first launch of each session" lp: #775117 - "emblems disappear on rename" lp: #877755 - "Remote Deleted file in Thunar remains visible until resfresh" lp: #999824 - "Incorrect alphabetical sort order in thunar with non-latin (eg. cyrillic) file names" lp: #684317 - "Thunar does not display current folder name" lp: #875193 - "Thunar crashed with SIGSEGV in g_file_equal()" lp: #900306 - "Hard to see, if volume is mounted or not" lp: #838917 -- Lionel Le Folgoc Mon, 03 Dec 2012 13:13:58 +0100 thunar (1.6.0-1) UNRELEASED; urgency=low [ Lionel Le Folgoc ] * Drop the "Send to printer" action, xfprint4 is obsolete. * debian/control: - dropped libtdb-dev from b-deps, emblems have been moved to gvfs. - bumped minimum required exo version to 0.10.0 for the new symbol. [ Yves-Alexis Perez ] * New upstream release. -- Yves-Alexis Perez Sun, 02 Dec 2012 23:08:04 +0100 thunar (1.4.0-1ubuntu3) raring; urgency=low * debian/patches: - xubuntu_fix-duplicate-volumes.patch: fix duplicate volumes appearing randomly in the side pane. lp: #1039375 -- Lionel Le Folgoc Mon, 29 Oct 2012 11:59:41 +0100 thunar (1.4.0-1ubuntu2) quantal; urgency=low * debian/patches: - 02_guard-for-no-supported-vfs-schemas.patch: fix segfault when g_vfs_get_supported_uri_schemes() returns NULL. lp: #1032340 -- Lionel Le Folgoc Sat, 18 Aug 2012 14:39:38 +0200 thunar (1.4.0-1ubuntu1) quantal; urgency=low * debian/control: recommend udisks2 for mounting devices. lp: #1014632 -- Lionel Le Folgoc Sun, 24 Jun 2012 13:18:55 +0200 thunar (1.4.0-1) experimental; urgency=low * New upstream stable release. * debian/patches: - 02_fix-link-gmodule.patch: dropped, included upstream. * debian/control: - debian/control: revert to unversioned libxfce4util-dev, bump required versions for Xfce 4.10. - drop b-deps on xfce4-dev-tools, libtool, automake, autoconf and gtk-doc-tools, unneeded. -- Lionel Le Folgoc Sat, 05 May 2012 14:08:14 +0200 thunar (1.3.2-1) experimental; urgency=low * New upstream development release. -- Lionel Le Folgoc Sun, 15 Apr 2012 16:06:21 +0200 thunar (1.3.1-1) experimental; urgency=low [ Lionel Le Folgoc ] * New upstream development release. * debian/patches: add missing DEP3 headers. * debian/patches/02_fix-link-gmodule.patch: added, explicitly link with gmodule, fix FTBFS. * debian/control: - switch to libxfce4util6-dev for the new api, and bump libxfce4ui-1-dev b-dep to >= 4.9.0 for the new help api. - b-dep on xfce4-dev-tools, libtool, automake, autoconf and gtk-doc-tools, needed by xdt-autogen. * debian/rules: - pass -X .la to dh_install instead of deleting them manually. - run xdt-autogen before configure, needed by the patch. * debian/patches/02_fix-link-gmodule.patch: fixed to apply cleanly against thunar 1.3.1. [ Yves-Alexis Perez ] * debian/control: - update exo build-dep to 0.6.0. - update standards version to 3.9.3. * debian/watch updated to track all releases. * debian/rules: - build with --parallel. -- Lionel Le Folgoc Sun, 08 Apr 2012 22:19:33 +0200 thunar (1.2.3-4) unstable; urgency=low [ Lionel Le Folgoc ] * debian/patches: add missing DEP3 headers. * debian/patches/02_fix-link-gmodule.patch: added, explicitly link with gmodule, fix FTBFS. * debian/control: b-dep on xfce4-dev-tools, libtool, automake, autoconf and gtk-doc-tools, needed by xdt-autogen. * debian/rules: run xdt-autogen before configure, needed by the patch. [ Yves-Alexis Perez ] * debian/control: - update standards version to 3.9.3. -- Yves-Alexis Perez Sun, 01 Apr 2012 14:15:12 +0200 thunar (1.2.3-3) unstable; urgency=low [ Lionel Le Folgoc ] * debian/rules, debian/thunar.install, debian/thunar-data.install: move thunar-sendto-email.desktop from thunar-data to thunar, as the path generated for the thunar-sendto-email binary is architecture-dependent. Closes: #657807 * debian/control: thunar breaks and replaces thunar-data (<< 1.2.3-3). [ Yves-Alexis Perez ] * debian/control: - debhelper build-dep bumped to 9. -- Lionel Le Folgoc Wed, 08 Feb 2012 07:25:01 +0100 thunar (1.2.3-2) unstable; urgency=low [ Yves-Alexis Perez ] * debian/rules: - re-add -z,defs to LDFLAGS. * debian/control: - only recommends thunar-volman on linux arches. [ Lionel Le Folgoc ] * debian/patches/01_support-non-multiarch-modules.patch: support modules installed in /usr/lib/$triplet and /usr/lib, to hopefully migrate smoothly thunar plugins to multiarch path over time without breakage. Closes: #645015 -- Yves-Alexis Perez Fri, 14 Oct 2011 18:47:39 +0200 thunar (1.2.3-1) unstable; urgency=low [ Lionel Le Folgoc ] * New upstream release, including: - Prevent falling back to an unexpected locale. lp: #557255 - Fix regression in 1.2.2 wrt SMB shares. Closes: #633772, lp: #846907 * debian/patches: - 01_retrieve-the-translated-desktop-file-name.patch, 04_fix-maxpathlen-hurd.patch: dropped, included upstream. [ Yves-Alexis Perez ] * debian/rules: - switch hardening to use dh9 mode * debian/compat: use mode 9. * debian/control: - drop build-dep on hardening-includes - bump debhelper build-dep to 8.9.4 for dh9 compat mode. - add Pre-depends on ${misc:Pre-Depends}. * debian/rules: - use multi-arch path in various rules. * debian/libthunarx-2-dev.install, debian/libthunarx-2-0.install, thunar.install: - use multi-arch path. -- Yves-Alexis Perez Thu, 29 Sep 2011 11:38:06 +0200 thunar (1.2.2-1) unstable; urgency=low [ Yves-Alexis Perez ] * New upstream release. - load network stuff later to speed up start (Xfce #7373). closes: #626200 lp: #775117 - fixed Dutch translation lp: #781048 * debian/patches: - 01_use-system-td dropped, included upstream. - 02_thunar-icon-naming-spec-compliance dropped, don't replace stock icons even if they aren't part of the spec. - 03_Don-t-interpret-file-display-names-as-format-strings dropped, included upstream. * debian/control: - drop build-dep on xfce4-dev-tools, libtool and gtk-doc-tools * debian/rules: - don't run xdt-autogen anymore. [ Lionel Le Folgoc ] * debian/patches: - 01_retrieve-the-translated-desktop-file-name.patch: fixes untranslated .desktop display name. - series: refreshed. -- Yves-Alexis Perez Sat, 18 Jun 2011 23:23:52 +0200 thunar (1.2.1-6) unstable; urgency=low * debian/patches: - 04_fix-maxpathlen-hurd added, tentative patch to fix build failure on GNU/Hurd. -- Yves-Alexis Perez Fri, 22 Apr 2011 08:15:46 +0200 thunar (1.2.1-5) unstable; urgency=low * Upload to unstable. * debian/control: - drop Emanuele and Simon from uploaders, thanks to them. - update standards version to 3.9.2. * debian/watch: - only pick stable versions. * debian/patches: - 03_Don-t-interpret-file-display-names-as-format-strings.patch added, fix format string error, fix CVE-2011-1588. -- Yves-Alexis Perez Tue, 19 Apr 2011 16:54:10 +0200 thunar (1.2.1-4) experimental; urgency=low * debian/control: - drop debhelper build-conflict, not supported for that purpose and 8.1.0 isn't available anywhere anymore anyway. - add build-dep on libxfce4util 4.8. closes: #616734 -- Yves-Alexis Perez Mon, 07 Mar 2011 07:31:56 +0100 thunar (1.2.1-3) experimental; urgency=low * debian/patches: this time really add the 01_system-tdb patch. * debian/rules: - run xdt-autogen since we touch Makefile.am. - cleanup generated files. -- Yves-Alexis Perez Sat, 19 Feb 2011 23:05:51 +0100 thunar (1.2.1-2) experimental; urgency=low * debian/control: - add build-conflicts on debhelper 8.1.0. - add build-dep on libtdb-dev. * debian/rules: - revert to the use of --remaining-packages in override target since debhelper 8.1.1 supports that. * debian/patches: - 01_system-tdb added, use system tdb and remove embedded one. -- Yves-Alexis Perez Tue, 15 Feb 2011 23:14:27 +0100 thunar (1.2.1-1) experimental; urgency=low [ Yves-Alexis Perez ] * New upstream release. Closes: #576090 - add support for GIO. lp: #530160, Closes: #552128 - trash applet for panel does not scale font lp: #58549 - add support for audio cd 'mount'. lp: #159627 - add support for smb://, ftp:// uris. lp: #277206, #601321 - i/o errors on slow filesystems. lp: #504806 - .ogg files are presented as video files lp: #512864 - thunar doesn't recognize *.doc mimetype lp: #510583, Closes: #547623 * debian/rules: - stop messing with POSIX_MADV since thunar-vfs is gone. - drop enable-final and disable-gnome-thumbnailers from configure flags. - configure *FLAGS using dpkg-buildflags. - link with --as-needed, -z,defs and -O1. - change thunarx libname to 2 in chrpath call. - rename lib dir from thunar to Thunar. - ignore thunarx plugins in dh_makeshlibs. - add hardening flags to {C,LD}FLAGS. - don't call --remaining-packages in dh_installdocs since it won't work in override rules. * debian/patches: - 01_thunar-help-directory dropped, not useful anymore. - 02_thunar-icon-naming-spec-compliance refreshed. - 03_thunar-window-maximize dropped, useless as well. - 05_fix-crash-drag-gdk-none.patch: dropped also. - 06_fix-sidepane-width.patch: dropped, included upstream. - 07_update-cursor-on-delete.patch: dropped. - 08_refilter-tree-hidden-dir.patch: dropped. * debian/control: - bump build-dep on exo (0.5.1). - add build-dep on libxfce4ui (4.7.1). - rename libthunar-vfs package to libthunarx since thunar-vfs has been dropped. - add recommends on tumbler. - bump xfce4-panel-dev b-dep to >= 4.7.0. - add build-dep on hardening-includes. - drop thunar recommends on gamin, add recommends on gvfs. * drop libthunar-vfs maintainer scripts and lintian overrides. * debian/watch updated. * debian/thunar.install: - rename lib dir from thunar to Thunar * debian/README.Debian: update help snippet for device mounts, recommend thunar-volman. [ Lionel Le Folgoc ] * New upstream bugfix release. * debian/control: - update libthunarx-2-dev dep on libexo-0.3-dev to libexo-1-dev - drop obsolete hal build and binary deps (this version uses GIO now) - drop libfam-dev build-deps and libgamin-dev build-conflicts - libthunarx-2-dev: drop dep on libexo-1-dev - build-depends on libnotify-dev and libgudev-1.0-dev, drop libcairo2-dev - bump xfce4-panel-dev build-dep to >= 4.7.0 - bump Standards-Version to 3.9.1, no change required. * debian/copyright: refreshed. * debian/source/format: switch to 3.0 (quilt). * debian/rules: drop simple-patchsys.mk include. * debian/patches: - 02_thunar-icon-naming-spec-compliance.patch: refreshed to apply cleanly - series: added, include the patch above. * debian/thunar.postinst: explicitly set -e. * Convert to dh7 + overrides: - debian/control: bump dh to >= 7.4.2~ and drop cdbs build-deps - debian/*.install: drop leading debian/tmp - debian/rules: + adapt it to dh7 + pass --docdir=\$${prefix}/share/doc/thunar-data instead of moving the dir manually as it breaks some docs + override dh_installdocs with --link-doc=thunar-data instead of making the symlinks manually. * debian/libthunarx-2-0.symbols: added. * debian/libthunarx-2-0.shlib: dropped. * debian/thunar.install, debian/rules: update paths to thunar-tpa. -- Yves-Alexis Perez Sun, 06 Feb 2011 19:56:45 +0100 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 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 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 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 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 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 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 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 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 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 Sun, 27 Apr 2008 16:35:45 +0200 thunar (0.9.0-7) unstable; urgency=low * upload to unstable. -- Yves-Alexis Perez 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Wed, 25 Jan 2006 10:19:32 +0000 thunar (0.2.0alpha-r19548-1) unstable; urgency=low * New Upstream (alpha) release -- Yves-Alexis Perez 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 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 Mon, 02 Jan 2006 23:42:32 +0100 thunar (0.1.4svn+r18850-1) unstable; urgency=low * Initial release Closes: #344321 -- Yves-Alexis Perez Fri, 30 Dec 2005 18:06:29 +0100 debian/bluetooth-sendto.desktop0000664000000000000000000000017612321167735014075 0ustar [Desktop Entry] Type=Application Name=Bluetooth recipient Icon=stock_mailto Exec=bluetooth-sendto %F TryExec=bluetooth-sendto debian/README.Debian0000664000000000000000000000112012321167735011232 0ustar thunar for Debian ----------------- In order to use volume management features (i.e. mounting external disks/USB sticks/cameras etc) you should install Gvfs and should have a working PolicyKit/ConsoleKit setup. Instructions for doing so can be found in relevant packages documentation and in xfce4-session README.Debian. Interested people can install the thunar-volman package to have automatic setup of removable device, including automounting mass storage devices, configuration of input devices, photo import from camera etc. -- Xfce Packagers debian/source/0000775000000000000000000000000012321171355010470 5ustar debian/source/format0000664000000000000000000000001412321167735011705 0ustar 3.0 (quilt) debian/patches/0000775000000000000000000000000012321171355010617 5ustar debian/patches/series0000664000000000000000000000025312321167735012043 0ustar 01_support-non-multiarch-modules.patch git-xfdesktop-4.11.patch gtk3-bookmarks.patch git-save-keyboard-shortcuts.patch menu-icon-tweaks.patch git-force-toolbr-icons.patch debian/patches/menu-icon-tweaks.patch0000664000000000000000000001635212321167735015044 0ustar Author: Thaddaeus Tintenfisch Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10652 Bug-Ubuntu: https://launchpad.net/bugs/1271861 Description: Add or change various menu icons: - Open With DEFAULT Application - New Tab/Window - Create Folder/Document - Empty File --- thunar/thunar-launcher.c | 8 +++++++- thunar/thunar-location-buttons.c | 2 +- thunar/thunar-standard-view.c | 2 +- thunar/thunar-templates-action.c | 3 ++- thunar/thunar-tree-view.c | 7 +++++++ thunar/thunar-window.c | 4 ++-- 6 files changed, 20 insertions(+), 6 deletions(-) --- a/thunar/thunar-launcher.c +++ b/thunar/thunar-launcher.c @@ -815,8 +815,9 @@ thunar_launcher_update_idle (gpointer da ** - "Open", "Open in n New Windows" and "Open in n New Tabs" actions **/ - /* Prepare "Open" label */ + /* Prepare "Open" label and icon */ gtk_action_set_label (launcher->action_open, _("_Open")); + gtk_action_set_stock_id (launcher->action_open, GTK_STOCK_OPEN); if (n_selected_files == n_directories && n_directories >= 1) { @@ -928,6 +929,7 @@ thunar_launcher_update_idle (gpointer da /* turn the "Open" action into "Execute" */ g_object_set (G_OBJECT (launcher->action_open), "label", _("_Execute"), + "stock-id", GTK_STOCK_EXECUTE, "tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files), NULL); } @@ -945,6 +947,10 @@ thunar_launcher_update_idle (gpointer da g_free (tooltip); g_free (label); + /* load default application icon */ + gtk_action_set_stock_id (launcher->action_open, NULL); + gtk_action_set_gicon (launcher->action_open, g_app_info_get_icon (applications->data)); + /* remember the default application for the "Open" action */ g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref); --- a/thunar/thunar-location-buttons.c +++ b/thunar/thunar-location-buttons.c @@ -175,7 +175,7 @@ static const GtkActionEntry action_entri { "location-buttons-open", GTK_STOCK_OPEN, N_("_Open"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open), }, { "location-buttons-open-in-new-tab", NULL, N_("Open in New Tab"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_tab), }, { "location-buttons-open-in-new-window", NULL, N_("Open in New Window"), "", NULL, G_CALLBACK (thunar_location_buttons_action_open_in_new_window), }, - { "location-buttons-create-folder", NULL, N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), }, + { "location-buttons-create-folder", "folder-new", N_("Create _Folder..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_create_folder), }, { "location-buttons-empty-trash", NULL, N_("_Empty Trash"), "", N_("Delete all files and folders in the Trash"), G_CALLBACK (thunar_location_buttons_action_empty_trash), }, { "location-buttons-paste-into-folder", GTK_STOCK_PASTE, N_("Paste Into Folder"), "", NULL, G_CALLBACK (thunar_location_buttons_action_paste_into_folder), }, { "location-buttons-properties", GTK_STOCK_PROPERTIES, N_("_Properties..."), "", NULL, G_CALLBACK (thunar_location_buttons_action_properties), }, --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -393,7 +393,7 @@ static const GtkActionEntry action_entri { { "file-context-menu", NULL, N_ ("File Context Menu"), NULL, NULL, NULL, }, { "folder-context-menu", NULL, N_ ("Folder Context Menu"), NULL, NULL, NULL, }, - { "create-folder", NULL, N_ ("Create _Folder..."), "N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), }, + { "create-folder", "folder-new", N_ ("Create _Folder..."), "N", N_ ("Create an empty folder within the current folder"), G_CALLBACK (thunar_standard_view_action_create_folder), }, { "properties", GTK_STOCK_PROPERTIES, N_ ("_Properties..."), "Return", N_ ("View the properties of the selected file"), G_CALLBACK (thunar_standard_view_action_properties), }, { "cut", GTK_STOCK_CUT, N_ ("Cu_t"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_cut), }, { "copy", GTK_STOCK_COPY, N_ ("_Copy"), NULL, NULL, G_CALLBACK (thunar_standard_view_action_copy), }, --- a/thunar/thunar-templates-action.c +++ b/thunar/thunar-templates-action.c @@ -477,7 +477,7 @@ thunar_templates_action_load_finished (T gtk_widget_show (item); /* add the icon for the emtpy file item */ - image = gtk_image_new_from_stock (GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock (GTK_STOCK_FILE, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); } @@ -542,6 +542,7 @@ thunar_templates_action_new (const gchar "hide-if-empty", FALSE, "label", label, "name", name, + "icon-name", "document-new", NULL); } --- a/thunar/thunar-tree-view.c +++ b/thunar/thunar-tree-view.c @@ -1093,6 +1093,7 @@ thunar_tree_view_context_menu (ThunarTre GtkWidget *menu; GtkWidget *item; GtkWidget *window; + GIcon *icon; GList *providers, *lp; GList *actions = NULL, *tmp; @@ -1201,6 +1202,12 @@ thunar_tree_view_context_menu (ThunarTre g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); + + /* set the stock icon */ + icon = g_themed_icon_new ("folder-new"); + image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + g_object_unref (icon); /* append a separator item */ item = gtk_separator_menu_item_new (); --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -345,8 +345,8 @@ struct _ThunarWindow static GtkActionEntry action_entries[] = { { "file-menu", NULL, N_ ("_File"), NULL, }, - { "new-tab", NULL, N_ ("New _Tab"), "T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), }, - { "new-window", NULL, N_ ("New _Window"), "N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), }, + { "new-tab", "tab-new", N_ ("New _Tab"), "T", N_ ("Open a new tab for the displayed location"), G_CALLBACK (thunar_window_action_open_new_tab), }, + { "new-window", "window-new", N_ ("New _Window"), "N", N_ ("Open a new Thunar window for the displayed location"), G_CALLBACK (thunar_window_action_open_new_window), }, { "sendto-menu", NULL, N_ ("_Send To"), NULL, }, { "empty-trash", NULL, N_ ("_Empty Trash"), NULL, N_ ("Delete all files and folders in the Trash"), G_CALLBACK (thunar_window_action_empty_trash), }, { "detach-tab", NULL, N_ ("Detac_h Tab"), NULL, N_ ("Open current folder in a new window"), G_CALLBACK (thunar_window_action_detach_tab), }, debian/patches/gtk3-bookmarks.patch0000664000000000000000000000463712321167735014517 0ustar Author: Alistair Buxton Description: Use the new Gtk bookmarks location. Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10627 --- thunar/thunar-gio-extensions.c | 2 +- thunar/thunar-shortcuts-model.c | 17 +++++++++++++++++ thunar/thunar-util.c | 10 +++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) --- a/thunar/thunar-gio-extensions.c +++ b/thunar/thunar-gio-extensions.c @@ -77,7 +77,7 @@ thunar_g_file_new_for_bookmarks (void) gchar *filename; GFile *bookmarks; - filename = g_build_filename (xfce_get_homedir (), ".gtk-bookmarks", NULL); + filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL); bookmarks = g_file_new_for_path (filename); g_free (filename); --- a/thunar/thunar-shortcuts-model.c +++ b/thunar/thunar-shortcuts-model.c @@ -1364,6 +1364,7 @@ thunar_shortcuts_model_save (ThunarShort gchar *uri; GList *lp; GError *err = NULL; + GFile *parent = NULL; _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); @@ -1389,6 +1390,22 @@ thunar_shortcuts_model_save (ThunarShort } } + /* create folder if it does not exist */ + parent = g_file_get_parent (model->bookmarks_file); + if (!g_file_make_directory_with_parents (parent, NULL, &err)) + { + if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_EXISTS)) + { + g_clear_error (&err); + } + else + { + g_warning ("Failed to create bookmarks folder: %s", err->message); + g_error_free (err); + } + } + g_clear_object (&parent); + /* write data to the disk */ bookmarks_path = g_file_get_path (model->bookmarks_file); if (!g_file_set_contents (bookmarks_path, contents->str, contents->len, &err)) --- a/thunar/thunar-util.c +++ b/thunar/thunar-util.c @@ -84,6 +84,15 @@ thunar_util_load_bookmarks (GFile /* append the GTK+ bookmarks (if any) */ fp = fopen (bookmarks_path, "r"); + g_free (bookmarks_path); + + if (G_UNLIKELY (fp == NULL)) + { + bookmarks_path = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); + fp = fopen(bookmarks_path, "r"); + g_free(bookmarks_path); + } + if (G_LIKELY (fp != NULL)) { while (fgets (line, sizeof (line), fp) != NULL) @@ -119,7 +128,6 @@ thunar_util_load_bookmarks (GFile fclose (fp); } - g_free (bookmarks_path); } debian/patches/git-xfdesktop-4.11.patch0000664000000000000000000001555212321167735015030 0ustar Author: Eric Koegel Date: Tue, 26 Nov 2013 10:16:21 +0300 Description: [PATCH] Update xfconf setting for thunar-wallpaper plugin Xfdesktop uses a new xfconf format starting with version 4.11. This patch updates the thunar-wallpaper plugin to set the image in the new format while continuing to set the old format. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/thunar/+bug/1277149 --- plugins/thunar-wallpaper/twp-provider.c | 111 ++++++++++++++++++++++++++++++-- 1 file changed, 106 insertions(+), 5 deletions(-) --- a/plugins/thunar-wallpaper/twp-provider.c +++ b/plugins/thunar-wallpaper/twp-provider.c @@ -27,6 +27,7 @@ #include #include +#include #include @@ -45,6 +46,7 @@ static GList *twp_provider_get_file_acti GList *files); static void twp_action_set_wallpaper (GtkAction *action, gpointer user_data); +static gint twp_get_active_workspace_number (GdkScreen *screen); typedef enum @@ -217,16 +219,23 @@ twp_action_set_wallpaper (GtkAction *act gint screen_nr = 0; gint n_monitors; gint monitor_nr = 0; + gint workspace; GdkScreen *screen; gchar *image_path_prop; gchar *image_show_prop; gchar *image_style_prop; + gchar *monitor_name; gchar *file_uri; gchar *escaped_file_name; gchar *file_name = NULL; gchar *hostname = NULL; gchar *command; + if (n_screens > 1) + screen = gdk_display_get_default_screen (display); + else + screen = gdk_display_get_screen (display, 0); + if (desktop_type != DESKTOP_TYPE_NONE) { file_uri = thunarx_file_info_get_uri (file_info); @@ -239,10 +248,6 @@ twp_action_set_wallpaper (GtkAction *act return; } - if (n_screens > 1) - screen = gdk_display_get_default_screen (display); - else - screen = gdk_display_get_screen (display, 0); n_monitors = gdk_screen_get_n_monitors (screen); if (n_monitors > 1) @@ -252,12 +257,17 @@ twp_action_set_wallpaper (GtkAction *act g_free(file_uri); } + workspace = twp_get_active_workspace_number (screen); + + monitor_name = gdk_screen_get_monitor_plug_name (screen, monitor_nr); + escaped_file_name = g_shell_quote (file_name); switch (desktop_type) { case DESKTOP_TYPE_XFCE: g_debug ("set on xfce"); + /* This is the format for xfdesktop before 4.11 */ image_path_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/image-path", screen_nr, monitor_nr); image_show_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/image-show", screen_nr, monitor_nr); image_style_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/image-style", screen_nr, monitor_nr); @@ -277,6 +287,34 @@ twp_action_set_wallpaper (GtkAction *act g_free(image_path_prop); g_free(image_show_prop); g_free(image_style_prop); + + /* This is the format for xfdesktop post 4.11. A workspace number is + * added and the monitor is referred to name. We set both formats so + * that it works as the user expects. */ + if (monitor_name) + { + image_path_prop = g_strdup_printf("/backdrop/screen%d/monitor%s/workspace%d/last-image", screen_nr, monitor_name, workspace); + image_style_prop = g_strdup_printf("/backdrop/screen%d/monitor%s/workspace%d/image-style", screen_nr, monitor_name, workspace); + } + else + { + /* gdk_screen_get_monitor_plug_name can return NULL, in those + * instances we fallback to monitor number but still include the + * workspace number */ + image_path_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/workspace%d/last-image", screen_nr, monitor_nr, workspace); + image_style_prop = g_strdup_printf("/backdrop/screen%d/monitor%d/workspace%d/image-style", screen_nr, monitor_nr, workspace); + } + + command = g_strdup_printf ("xfconf-query -c xfce4-desktop -p %s --create -t string -s %s", image_path_prop, escaped_file_name); + g_spawn_command_line_async (command, NULL); + g_free (command); + + command = g_strdup_printf ("xfconf-query -c xfce4-desktop -p %s --create -t int -s 3", image_style_prop); + g_spawn_command_line_async (command, NULL); + g_free (command); + + g_free(image_path_prop); + g_free(image_style_prop); break; case DESKTOP_TYPE_NAUTILUS: @@ -302,6 +340,69 @@ twp_action_set_wallpaper (GtkAction *act break; } + g_free (monitor_name); g_free (escaped_file_name); - g_free(file_name); + g_free (file_name); +} + +/* Taken from xfce_spawn_get_active_workspace_number in xfce-spawn.c apart of + * the libxfce4ui library. + * http://git.xfce.org/xfce/libxfce4ui/tree/libxfce4ui/xfce-spawn.c#n193 + */ +static gint +twp_get_active_workspace_number (GdkScreen *screen) +{ + GdkWindow *root; + gulong bytes_after_ret = 0; + gulong nitems_ret = 0; + guint *prop_ret = NULL; + Atom _NET_CURRENT_DESKTOP; + Atom _WIN_WORKSPACE; + Atom type_ret = None; + gint format_ret; + gint ws_num = 0; + + gdk_error_trap_push (); + + root = gdk_screen_get_root_window (screen); + + /* determine the X atom values */ + _NET_CURRENT_DESKTOP = XInternAtom (GDK_WINDOW_XDISPLAY (root), "_NET_CURRENT_DESKTOP", False); + _WIN_WORKSPACE = XInternAtom (GDK_WINDOW_XDISPLAY (root), "_WIN_WORKSPACE", False); + + if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), + gdk_x11_get_default_root_xwindow(), + _NET_CURRENT_DESKTOP, 0, 32, False, XA_CARDINAL, + &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, + (gpointer) &prop_ret) != Success) + { + if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), + gdk_x11_get_default_root_xwindow(), + _WIN_WORKSPACE, 0, 32, False, XA_CARDINAL, + &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, + (gpointer) &prop_ret) != Success) + { + if (G_UNLIKELY (prop_ret != NULL)) + { + XFree (prop_ret); + prop_ret = NULL; + } + } + } + + if (G_LIKELY (prop_ret != NULL)) + { + if (G_LIKELY (type_ret != None && format_ret != 0)) + ws_num = *prop_ret; + XFree (prop_ret); + } + +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else + if (gdk_error_trap_pop () != 0) + return 0; +#endif + + return ws_num; } debian/patches/git-save-keyboard-shortcuts.patch0000664000000000000000000001124012321167735017216 0ustar Origin: http://git.xfce.org/xfce/thunar/commit/?id=821c9b480b7feb625461b5ec1f35e92dcc87e3d9 Bug-Ubuntu: https://launchpad.net/bugs/1186846 Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10139 Description: Makes keyboard shortcuts save when changed rather than when thunar is closed --- thunar/thunar-application.c | 69 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 7 deletions(-) --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -59,6 +59,8 @@ #include #include +#define ACCEL_MAP_PATH "Thunar/accels.scm" + /* Prototype for the Thunar job launchers */ @@ -85,6 +87,8 @@ static void thunar_application guint prop_id, const GValue *value, GParamSpec *pspec); +static void thunar_application_accel_map_changed (ThunarApplication *application); +static gboolean thunar_application_accel_map_save (gpointer user_data); static void thunar_application_collect_and_launch (ThunarApplication *application, gpointer parent, const gchar *icon_name, @@ -142,6 +146,9 @@ struct _ThunarApplication gboolean daemon; + guint accel_map_save_id; + GtkAccelMap *accel_map; + guint show_dialogs_timer_id; #ifdef HAVE_GUDEV @@ -220,7 +227,7 @@ thunar_application_init (ThunarApplicati application->progress_dialog = NULL; /* check if we have a saved accel map */ - path = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, "Thunar/accels.scm"); + path = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, ACCEL_MAP_PATH); if (G_LIKELY (path != NULL)) { /* load the accel map */ @@ -228,6 +235,11 @@ thunar_application_init (ThunarApplicati g_free (path); } + /* watch for changes */ + application->accel_map = gtk_accel_map_get (); + g_signal_connect_swapped (G_OBJECT (application->accel_map), "changed", + G_CALLBACK (thunar_application_accel_map_changed), application); + #ifdef HAVE_GUDEV /* establish connection with udev */ application->udev_client = g_udev_client_new (subsystems); @@ -245,21 +257,21 @@ static void thunar_application_finalize (GObject *object) { ThunarApplication *application = THUNAR_APPLICATION (object); - gchar *path; GList *lp; /* unqueue all files waiting to be processed */ thunar_g_file_list_free (application->files_to_launch); /* save the current accel map */ - path = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "Thunar/accels.scm", TRUE); - if (G_LIKELY (path != NULL)) + if (G_UNLIKELY (application->accel_map_save_id != 0)) { - /* save the accel map */ - gtk_accel_map_save (path); - g_free (path); + g_source_remove (application->accel_map_save_id); + thunar_application_accel_map_save (application); } + if (application->accel_map != NULL) + g_object_unref (G_OBJECT (application->accel_map)); + #ifdef HAVE_GUDEV /* cancel any pending volman watch source */ if (G_UNLIKELY (application->volman_watch_id != 0)) @@ -347,6 +359,49 @@ thunar_application_set_property (GObject } + +static gboolean +thunar_application_accel_map_save (gpointer user_data) +{ + ThunarApplication *application = THUNAR_APPLICATION (user_data); + gchar *path; + + _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE); + + application->accel_map_save_id = 0; + + /* save the current accel map */ + path = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, ACCEL_MAP_PATH, TRUE); + if (G_LIKELY (path != NULL)) + { + /* save the accel map */ + gtk_accel_map_save (path); + g_free (path); + } + + return FALSE; +} + + + +static void +thunar_application_accel_map_changed (ThunarApplication *application) +{ + _thunar_return_if_fail (THUNAR_IS_APPLICATION (application)); + + /* stop pending save */ + if (application->accel_map_save_id != 0) + { + g_source_remove (application->accel_map_save_id); + application->accel_map_save_id = 0; + } + + /* schedule new save */ + application->accel_map_save_id = + g_timeout_add_seconds (10, thunar_application_accel_map_save, application); +} + + static void thunar_application_collect_and_launch (ThunarApplication *application, debian/patches/git-force-toolbr-icons.patch0000664000000000000000000000211312321167735016133 0ustar Origin: http://git.xfce.org/xfce/thunar/commit/?id=c9712b835be90127ef4af1ac1b1fd645081a646a Description: Fix "Home" and "Open Parent" icons going missing from toolbar Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10179 --- thunar/thunar-window.c | 1 + 1 file changed, 1 insertion(+) --- a/thunar/thunar-window.c +++ b/thunar/thunar-window.c @@ -1821,6 +1821,7 @@ thunar_window_install_location_bar (Thun /* setup the toolbar for the location bar */ window->location_toolbar = gtk_ui_manager_get_widget (window->ui_manager, "/location-toolbar"); g_object_get (G_OBJECT (window->preferences), "misc-small-toolbar-icons", &small_icons, NULL); + gtk_toolbar_set_style (GTK_TOOLBAR (window->location_toolbar), GTK_TOOLBAR_ICONS); gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->location_toolbar), small_icons ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_table_attach (GTK_TABLE (window->table), window->location_toolbar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); debian/patches/01_support-non-multiarch-modules.patch0000664000000000000000000000456412321167735020120 0ustar From 6376360bd33778c751d878a1c722fcaedbe69512 Mon Sep 17 00:00:00 2001 From: Lionel Le Folgoc Date: Tue, 11 Oct 2011 21:30:17 +0200 Subject: Look for plugins in {non-,}multiarch THUNARX_DIRECTORY This will let a multiarch enabled libthunarx find plugins built against a non-multiarch thunar (load plugins from both /usr/lib/$triplet and /usr/lib). Forwarded: not-needed --- thunarx/thunarx-provider-factory.c | 12 +++++++++++- thunarx/thunarx-provider-module.c | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c index f2588eb..cbcf642 100644 --- a/thunarx/thunarx-provider-factory.c +++ b/thunarx/thunarx-provider-factory.c @@ -145,8 +145,17 @@ thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) GList *modules = NULL; GList *lp; GDir *dp; + gsize i; + const gchar *thunarx_dirs[] = + { + THUNARX_DIRECTORY, + "/usr/lib/thunarx-2" + }; - dp = g_dir_open (THUNARX_DIRECTORY, 0, NULL); + /* Search both multiarch and non-multiarch THUNARX_DIRECTORYs */ + for (i = 0; i < G_N_ELEMENTS (thunarx_dirs); ++i) + { + dp = g_dir_open (thunarx_dirs[i], 0, NULL); if (G_LIKELY (dp != NULL)) { /* determine the types for all existing plugins */ @@ -192,6 +201,7 @@ thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory) g_dir_close (dp); } + } return modules; } diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c index 4f96ffd..dbb693b 100644 --- a/thunarx/thunarx-provider-module.c +++ b/thunarx/thunarx-provider-module.c @@ -178,6 +178,12 @@ thunarx_provider_module_load (GTypeModule *type_module) /* load the module using the runtime link editor */ path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL); + if (!g_file_test (path, G_FILE_TEST_EXISTS)) + { + /* if it doesn't exist in the default dir, try non-multiarch THUNARX_DIRECTORY */ + g_free (path); + path = g_build_filename ("/usr/lib/thunarx-2", type_module->name, NULL); + } module->library = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); g_free (path); -- 1.7.7 debian/patches/0001-Don-t-copy-templates-but-create-them-bug-8312.patch0000664000000000000000000002565612321167735022322 0ustar From 372d5d61b987c7fd1dfd5eed67955f90db9f125e Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Sat, 29 Sep 2012 15:50:16 +0200 Subject: [PATCH] Don't copy templates but create them (bug #8312). Instead of copying templates, create new files and allow to feed a template file. It is then easy with g_output_stream_splice to feed the template data into the new file. This way the new file has the template data, but not any of the attributes (timestamps etc). --- thunar/thunar-application.c | 27 ++++++++++++++------------ thunar/thunar-application.h | 1 + thunar/thunar-io-jobs.c | 42 ++++++++++++++++++++++++++++++++++++----- thunar/thunar-io-jobs.h | 3 ++- thunar/thunar-standard-view.c | 13 ++++--------- 5 files changed, 59 insertions(+), 27 deletions(-) diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c index c6dc674..94762ac 100644 --- a/thunar/thunar-application.c +++ b/thunar/thunar-application.c @@ -1414,7 +1414,7 @@ thunar_application_create_file (ThunarApplication *application, if (is_directory) thunar_application_mkdir (application, screen, &path_list, NULL); else - thunar_application_creat (application, screen, &path_list, NULL); + thunar_application_creat (application, screen, &path_list, NULL, NULL); g_object_unref (path_list.data); g_free (name); @@ -1444,7 +1444,6 @@ thunar_application_create_file_from_template (ThunarApplication *application, GdkScreen *screen, const gchar *startup_id) { - GList source_path_list; GList target_path_list; gchar *name; gchar *title; @@ -1468,18 +1467,15 @@ thunar_application_create_file_from_template (ThunarApplication *application, title); if (G_LIKELY (name != NULL)) { - /* fake the source file list */ - source_path_list.data = thunar_file_get_file (template_file); - source_path_list.prev = source_path_list.next = NULL; - /* fake the target path list */ target_path_list.data = g_file_get_child (thunar_file_get_file (parent_directory), name); target_path_list.next = target_path_list.prev = NULL; /* launch the operation */ - thunar_application_copy_to (application, screen, - &source_path_list, &target_path_list, - NULL); + thunar_application_creat (application, screen, + &target_path_list, + thunar_file_get_file (template_file), + NULL); /* release the target path */ g_object_unref (target_path_list.data); @@ -1817,10 +1813,11 @@ thunar_application_trash (ThunarApplication *application, static ThunarJob * -creat_stub (GList *source_path_list, +creat_stub (GList *template_file, GList *target_path_list) { - return thunar_io_jobs_create_files (source_path_list); + _thunar_return_val_if_fail (template_file->data == NULL || G_IS_FILE (template_file->data), NULL); + return thunar_io_jobs_create_files (target_path_list, template_file->data); } @@ -1842,15 +1839,21 @@ void thunar_application_creat (ThunarApplication *application, gpointer parent, GList *file_list, + GFile *template_file, GClosure *new_files_closure) { + GList template_list; + _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent)); _thunar_return_if_fail (THUNAR_IS_APPLICATION (application)); + template_list.next = template_list.prev = NULL; + template_list.data = template_file; + /* launch the operation */ thunar_application_launch (application, parent, "document-new", _("Creating files..."), creat_stub, - file_list, file_list, new_files_closure); + &template_list, file_list, new_files_closure); } diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h index 50845a3..f674544 100644 --- a/thunar/thunar-application.h +++ b/thunar/thunar-application.h @@ -127,6 +127,7 @@ void thunar_application_trash (ThunarApplic void thunar_application_creat (ThunarApplication *application, gpointer parent, GList *file_list, + GFile *template_file, GClosure *new_files_closure); void thunar_application_mkdir (ThunarApplication *application, diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c index a90ab69..6db1b8b 100644 --- a/thunar/thunar-io-jobs.c +++ b/thunar/thunar-io-jobs.c @@ -96,18 +96,33 @@ _thunar_io_jobs_create (ThunarJob *job, GList *lp; gchar *base_name; gchar *display_name; + GFile *template_file; + GFileInputStream *template_stream = NULL; _thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE); _thunar_return_val_if_fail (param_values != NULL, FALSE); - _thunar_return_val_if_fail (param_values->n_values == 1, FALSE); + _thunar_return_val_if_fail (param_values->n_values == 2, FALSE); _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE); /* get the file list */ file_list = g_value_get_boxed (g_value_array_get_nth (param_values, 0)); + template_file = g_value_get_object (g_value_array_get_nth (param_values, 1)); /* we know the total amount of files to be processed */ thunar_job_set_total_files (THUNAR_JOB (job), file_list); + /* check if we need to open the template */ + if (template_file != NULL) + { + /* open read stream to feed in the new files */ + template_stream = g_file_read (template_file, exo_job_get_cancellable (EXO_JOB (job)), &err); + if (G_UNLIKELY (template_stream == NULL)) + { + g_propagate_error (error, err); + return FALSE; + } + } + /* iterate over all files in the list */ for (lp = file_list; err == NULL && lp != NULL && !exo_job_is_cancelled (EXO_JOB (job)); @@ -197,9 +212,24 @@ again: } } else - g_object_unref (stream); + { + if (template_stream != NULL) + { + /* write the template into the new file */ + g_output_stream_splice (G_OUTPUT_STREAM (stream), + G_INPUT_STREAM (template_stream), + G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, + exo_job_get_cancellable (EXO_JOB (job)), + NULL); + } + + g_object_unref (stream); + } } + if (template_stream != NULL) + g_object_unref (template_stream); + /* check if we have failed */ if (err != NULL) { @@ -220,10 +250,12 @@ again: ThunarJob * -thunar_io_jobs_create_files (GList *file_list) +thunar_io_jobs_create_files (GList *file_list, + GFile *template_file) { - return thunar_simple_job_launch (_thunar_io_jobs_create, 1, - THUNAR_TYPE_G_FILE_LIST, file_list); + return thunar_simple_job_launch (_thunar_io_jobs_create, 2, + THUNAR_TYPE_G_FILE_LIST, file_list, + G_TYPE_FILE, template_file); } diff --git a/thunar/thunar-io-jobs.h b/thunar/thunar-io-jobs.h index 11d9c0d..51dc682 100644 --- a/thunar/thunar-io-jobs.h +++ b/thunar/thunar-io-jobs.h @@ -26,7 +26,8 @@ G_BEGIN_DECLS -ThunarJob *thunar_io_jobs_create_files (GList *file_list) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; +ThunarJob *thunar_io_jobs_create_files (GList *file_list, + GFile *template_file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; ThunarJob *thunar_io_jobs_make_directories (GList *file_list) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; ThunarJob *thunar_io_jobs_unlink_files (GList *file_list) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; ThunarJob *thunar_io_jobs_move_files (GList *source_file_list, diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c index 6a90e41..ebb2151 100644 --- a/thunar/thunar-standard-view.c +++ b/thunar/thunar-standard-view.c @@ -1875,7 +1875,7 @@ thunar_standard_view_action_create_empty_file (GtkAction *action, /* launch the operation */ application = thunar_application_get (); - thunar_application_creat (application, GTK_WIDGET (standard_view), &path_list, + thunar_application_creat (application, GTK_WIDGET (standard_view), &path_list, NULL, thunar_standard_view_new_files_closure (standard_view, NULL)); g_object_unref (application); @@ -1941,7 +1941,6 @@ thunar_standard_view_action_create_template (GtkAction *action, { ThunarApplication *application; ThunarFile *current_directory; - GList source_path_list; GList target_path_list; gchar *name; gchar *title; @@ -1965,11 +1964,6 @@ thunar_standard_view_action_create_template (GtkAction *action, current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view)); if (G_LIKELY (current_directory != NULL)) { - /* fake the source path list */ - source_path_list.data = thunar_file_get_file (file); - source_path_list.next = NULL; - source_path_list.prev = NULL; - /* fake the target path list */ target_path_list.data = g_file_get_child (thunar_file_get_file (current_directory), name); target_path_list.next = NULL; @@ -1977,8 +1971,9 @@ thunar_standard_view_action_create_template (GtkAction *action, /* launch the operation */ application = thunar_application_get (); - thunar_application_copy_to (application, GTK_WIDGET (standard_view), &source_path_list, &target_path_list, - thunar_standard_view_new_files_closure (standard_view, NULL)); + thunar_application_creat (application, GTK_WIDGET (standard_view), &target_path_list, + thunar_file_get_file (file), + thunar_standard_view_new_files_closure (standard_view, NULL)); g_object_unref (G_OBJECT (application)); /* release the target path */ -- 1.7.10.4