Date: Saturday, November 3, 2012 @ 02:32:33 Author: foutrelis Revision: 170122
archrelease: copy trunk to extra-i686, extra-x86_64 Added: thunar/repos/extra-i686/PKGBUILD (from rev 170121, thunar/trunk/PKGBUILD) thunar/repos/extra-i686/thunar-1.4.0-dont-add-duplicates-of-devices.patch (from rev 170121, thunar/trunk/thunar-1.4.0-dont-add-duplicates-of-devices.patch) thunar/repos/extra-i686/thunar-1.4.0-show-loop-devices-hack.patch (from rev 170121, thunar/trunk/thunar-1.4.0-show-loop-devices-hack.patch) thunar/repos/extra-i686/thunar.install (from rev 170121, thunar/trunk/thunar.install) thunar/repos/extra-x86_64/PKGBUILD (from rev 170121, thunar/trunk/PKGBUILD) thunar/repos/extra-x86_64/thunar-1.4.0-dont-add-duplicates-of-devices.patch (from rev 170121, thunar/trunk/thunar-1.4.0-dont-add-duplicates-of-devices.patch) thunar/repos/extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch (from rev 170121, thunar/trunk/thunar-1.4.0-show-loop-devices-hack.patch) thunar/repos/extra-x86_64/thunar.install (from rev 170121, thunar/trunk/thunar.install) Deleted: thunar/repos/extra-i686/PKGBUILD thunar/repos/extra-i686/thunar-1.4.0-show-loop-devices-hack.patch thunar/repos/extra-i686/thunar.install thunar/repos/extra-x86_64/PKGBUILD thunar/repos/extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch thunar/repos/extra-x86_64/thunar.install ----------------------------------------------------------------+ extra-i686/PKGBUILD | 134 +++++----- extra-i686/thunar-1.4.0-dont-add-duplicates-of-devices.patch | 59 ++++ extra-i686/thunar-1.4.0-show-loop-devices-hack.patch | 30 +- extra-i686/thunar.install | 28 +- extra-x86_64/PKGBUILD | 134 +++++----- extra-x86_64/thunar-1.4.0-dont-add-duplicates-of-devices.patch | 59 ++++ extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch | 30 +- extra-x86_64/thunar.install | 28 +- 8 files changed, 316 insertions(+), 186 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-11-03 06:32:00 UTC (rev 170121) +++ extra-i686/PKGBUILD 2012-11-03 06:32:33 UTC (rev 170122) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Andrew Simmons <andrew.simm...@gmail.com> - -pkgname=thunar -pkgver=1.4.0 -pkgrel=2 -pkgdesc="Modern file manager for Xfce" -arch=('i686' 'x86_64') -url="http://thunar.xfce.org" -license=('GPL2' 'LGPL2.1') -groups=('xfce4') -depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' - 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') -makedepends=('intltool' 'gtk-doc' 'xfce4-panel') -optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' - 'polkit-gnome: for mounting internal partitions (needs root password)' - 'xfce4-panel: for trash applet' - 'tumbler: for thumbnail previews' - 'thunar-volman: manages removable devices' - 'thunar-archive-plugin: create and deflate archives' - 'thunar-media-tags-plugin: view/edit id3/ogg tags') -options=('!libtool') -install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2 - thunar-1.4.0-show-loop-devices-hack.patch) -sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba' - '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e') - -build() { - cd "$srcdir/Thunar-$pkgver" - - # Fix: Loop devices not appearing in Thunar side pane - # https://bugs.archlinux.org/task/29894 - # https://bugzilla.xfce.org/show_bug.cgi?id=8947 - patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gio-unix \ - --enable-dbus \ - --enable-startup-notification \ - --enable-gudev \ - --enable-notifications \ - --enable-exif \ - --enable-pcre \ - --enable-gtk-doc \ - --disable-debug - make -} - -package() { - cd "$srcdir/Thunar-$pkgver" - - make DESTDIR=${pkgdir} install - sed -i 's:x-directory/gnome-default-handler;::' \ - "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop" -} - -# vim:set ts=2 sw=2 et: Copied: thunar/repos/extra-i686/PKGBUILD (from rev 170121, thunar/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Andrew Simmons <andrew.simm...@gmail.com> + +pkgname=thunar +pkgver=1.4.0 +pkgrel=3 +pkgdesc="Modern file manager for Xfce" +arch=('i686' 'x86_64') +url="http://thunar.xfce.org" +license=('GPL2' 'LGPL2.1') +groups=('xfce4') +depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' + 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') +makedepends=('intltool' 'gtk-doc' 'xfce4-panel') +optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' + 'polkit-gnome: for mounting internal partitions (needs root password)' + 'xfce4-panel: for trash applet' + 'tumbler: for thumbnail previews' + 'thunar-volman: manages removable devices' + 'thunar-archive-plugin: create and deflate archives' + 'thunar-media-tags-plugin: view/edit id3/ogg tags') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2 + thunar-1.4.0-dont-add-duplicates-of-devices.patch + thunar-1.4.0-show-loop-devices-hack.patch) +sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba' + 'c25f86a4c298c24327b0681702167aea9f9d712a738c8f3883f5d66da7f08f19' + '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e') + +build() { + cd "$srcdir/Thunar-$pkgver" + + # https://bugzilla.xfce.org/show_bug.cgi?id=9440 + # Backport of http://git.xfce.org/xfce/thunar/commit/?id=70a4301 + patch -Np1 -i "$srcdir/thunar-1.4.0-dont-add-duplicates-of-devices.patch" + + # Fix: Loop devices not appearing in Thunar side pane + # https://bugs.archlinux.org/task/29894 + # https://bugzilla.xfce.org/show_bug.cgi?id=8947 + patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gio-unix \ + --enable-dbus \ + --enable-startup-notification \ + --enable-gudev \ + --enable-notifications \ + --enable-exif \ + --enable-pcre \ + --enable-gtk-doc \ + --disable-debug + make +} + +package() { + cd "$srcdir/Thunar-$pkgver" + + make DESTDIR=${pkgdir} install + sed -i 's:x-directory/gnome-default-handler;::' \ + "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop" +} + +# vim:set ts=2 sw=2 et: Copied: thunar/repos/extra-i686/thunar-1.4.0-dont-add-duplicates-of-devices.patch (from rev 170121, thunar/trunk/thunar-1.4.0-dont-add-duplicates-of-devices.patch) =================================================================== --- extra-i686/thunar-1.4.0-dont-add-duplicates-of-devices.patch (rev 0) +++ extra-i686/thunar-1.4.0-dont-add-duplicates-of-devices.patch 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,59 @@ +diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c +--- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c 2012-11-03 07:42:39.000000000 +0200 ++++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c 2012-11-03 08:13:25.000000000 +0200 +@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo + GVolume *volume, + ThunarShortcutsModel *model) + { ++ GList *lp; ++ gint idx; ++ + _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); + _thunar_return_if_fail (model->volume_monitor == volume_monitor); + _thunar_return_if_fail (G_IS_VOLUME (volume)); + _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); + ++ /* check that the volume is not in the internal list already */ ++ if (g_list_find (model->hidden_volumes, volume) != NULL) ++ return; ++ ++ /* nor in the list of visible volumes */ ++ for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next) ++ { ++ if (THUNAR_SHORTCUT (lp->data)->volume == volume) ++ return; ++ } ++ + /* place the volume on the hidden list */ + model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); + +diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c +--- Thunar-1.4.0.orig/thunar/thunar-tree-model.c 2012-11-03 07:42:39.000000000 +0200 ++++ Thunar-1.4.0/thunar/thunar-tree-model.c 2012-11-03 08:09:36.000000000 +0200 +@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM + GVolume *volume, + ThunarTreeModel *model) + { ++ ThunarTreeModelItem *item = NULL; ++ GNode *node; ++ + _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); + _thunar_return_if_fail (model->volume_monitor == volume_monitor); + _thunar_return_if_fail (G_IS_VOLUME (volume)); + _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model)); + ++ /* check that the volume is not in the internal list already */ ++ if (g_list_find (model->hidden_volumes, volume) != NULL) ++ return; ++ ++ /* nor in the list of visible volumes */ ++ for (node = model->root->children; node != NULL; node = node->next) ++ { ++ item = THUNAR_TREE_MODEL_ITEM (node->data); ++ if (item->volume == volume) ++ return; ++ } ++ + /* place the volume on the hidden list */ + model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); + Deleted: extra-i686/thunar-1.4.0-show-loop-devices-hack.patch =================================================================== --- extra-i686/thunar-1.4.0-show-loop-devices-hack.patch 2012-11-03 06:32:00 UTC (rev 170121) +++ extra-i686/thunar-1.4.0-show-loop-devices-hack.patch 2012-11-03 06:32:33 UTC (rev 170122) @@ -1,15 +0,0 @@ -diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c ---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300 -+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300 -@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol - has_media = g_drive_has_media (drive); - g_object_unref (drive); - } -+ else -+ { -+ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */ -+ has_media = g_volume_can_mount (volume); -+ } - - mount = g_volume_get_mount (volume); - if (mount != NULL) Copied: thunar/repos/extra-i686/thunar-1.4.0-show-loop-devices-hack.patch (from rev 170121, thunar/trunk/thunar-1.4.0-show-loop-devices-hack.patch) =================================================================== --- extra-i686/thunar-1.4.0-show-loop-devices-hack.patch (rev 0) +++ extra-i686/thunar-1.4.0-show-loop-devices-hack.patch 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,15 @@ +diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c +--- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300 ++++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300 +@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol + has_media = g_drive_has_media (drive); + g_object_unref (drive); + } ++ else ++ { ++ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */ ++ has_media = g_volume_can_mount (volume); ++ } + + mount = g_volume_get_mount (volume); + if (mount != NULL) Deleted: extra-i686/thunar.install =================================================================== --- extra-i686/thunar.install 2012-11-03 06:32:00 UTC (rev 170121) +++ extra-i686/thunar.install 2012-11-03 06:32:33 UTC (rev 170122) @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: thunar/repos/extra-i686/thunar.install (from rev 170121, thunar/trunk/thunar.install) =================================================================== --- extra-i686/thunar.install (rev 0) +++ extra-i686/thunar.install 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-11-03 06:32:00 UTC (rev 170121) +++ extra-x86_64/PKGBUILD 2012-11-03 06:32:33 UTC (rev 170122) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Andrew Simmons <andrew.simm...@gmail.com> - -pkgname=thunar -pkgver=1.4.0 -pkgrel=2 -pkgdesc="Modern file manager for Xfce" -arch=('i686' 'x86_64') -url="http://thunar.xfce.org" -license=('GPL2' 'LGPL2.1') -groups=('xfce4') -depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' - 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') -makedepends=('intltool' 'gtk-doc' 'xfce4-panel') -optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' - 'polkit-gnome: for mounting internal partitions (needs root password)' - 'xfce4-panel: for trash applet' - 'tumbler: for thumbnail previews' - 'thunar-volman: manages removable devices' - 'thunar-archive-plugin: create and deflate archives' - 'thunar-media-tags-plugin: view/edit id3/ogg tags') -options=('!libtool') -install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2 - thunar-1.4.0-show-loop-devices-hack.patch) -sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba' - '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e') - -build() { - cd "$srcdir/Thunar-$pkgver" - - # Fix: Loop devices not appearing in Thunar side pane - # https://bugs.archlinux.org/task/29894 - # https://bugzilla.xfce.org/show_bug.cgi?id=8947 - patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gio-unix \ - --enable-dbus \ - --enable-startup-notification \ - --enable-gudev \ - --enable-notifications \ - --enable-exif \ - --enable-pcre \ - --enable-gtk-doc \ - --disable-debug - make -} - -package() { - cd "$srcdir/Thunar-$pkgver" - - make DESTDIR=${pkgdir} install - sed -i 's:x-directory/gnome-default-handler;::' \ - "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop" -} - -# vim:set ts=2 sw=2 et: Copied: thunar/repos/extra-x86_64/PKGBUILD (from rev 170121, thunar/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Andrew Simmons <andrew.simm...@gmail.com> + +pkgname=thunar +pkgver=1.4.0 +pkgrel=3 +pkgdesc="Modern file manager for Xfce" +arch=('i686' 'x86_64') +url="http://thunar.xfce.org" +license=('GPL2' 'LGPL2.1') +groups=('xfce4') +depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' + 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') +makedepends=('intltool' 'gtk-doc' 'xfce4-panel') +optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' + 'polkit-gnome: for mounting internal partitions (needs root password)' + 'xfce4-panel: for trash applet' + 'tumbler: for thumbnail previews' + 'thunar-volman: manages removable devices' + 'thunar-archive-plugin: create and deflate archives' + 'thunar-media-tags-plugin: view/edit id3/ogg tags') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/1.4/Thunar-$pkgver.tar.bz2 + thunar-1.4.0-dont-add-duplicates-of-devices.patch + thunar-1.4.0-show-loop-devices-hack.patch) +sha256sums=('2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba' + 'c25f86a4c298c24327b0681702167aea9f9d712a738c8f3883f5d66da7f08f19' + '185c44db9bdf578d22cb69b81dce7fcc3e2ee6031b1547de6453ff0752dbc97e') + +build() { + cd "$srcdir/Thunar-$pkgver" + + # https://bugzilla.xfce.org/show_bug.cgi?id=9440 + # Backport of http://git.xfce.org/xfce/thunar/commit/?id=70a4301 + patch -Np1 -i "$srcdir/thunar-1.4.0-dont-add-duplicates-of-devices.patch" + + # Fix: Loop devices not appearing in Thunar side pane + # https://bugs.archlinux.org/task/29894 + # https://bugzilla.xfce.org/show_bug.cgi?id=8947 + patch -Np1 -i "$srcdir/thunar-1.4.0-show-loop-devices-hack.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gio-unix \ + --enable-dbus \ + --enable-startup-notification \ + --enable-gudev \ + --enable-notifications \ + --enable-exif \ + --enable-pcre \ + --enable-gtk-doc \ + --disable-debug + make +} + +package() { + cd "$srcdir/Thunar-$pkgver" + + make DESTDIR=${pkgdir} install + sed -i 's:x-directory/gnome-default-handler;::' \ + "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop" +} + +# vim:set ts=2 sw=2 et: Copied: thunar/repos/extra-x86_64/thunar-1.4.0-dont-add-duplicates-of-devices.patch (from rev 170121, thunar/trunk/thunar-1.4.0-dont-add-duplicates-of-devices.patch) =================================================================== --- extra-x86_64/thunar-1.4.0-dont-add-duplicates-of-devices.patch (rev 0) +++ extra-x86_64/thunar-1.4.0-dont-add-duplicates-of-devices.patch 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,59 @@ +diff -uprb Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c Thunar-1.4.0/thunar/thunar-shortcuts-model.c +--- Thunar-1.4.0.orig/thunar/thunar-shortcuts-model.c 2012-11-03 07:42:39.000000000 +0200 ++++ Thunar-1.4.0/thunar/thunar-shortcuts-model.c 2012-11-03 08:13:25.000000000 +0200 +@@ -1221,11 +1221,25 @@ thunar_shortcuts_model_volume_added (GVo + GVolume *volume, + ThunarShortcutsModel *model) + { ++ GList *lp; ++ gint idx; ++ + _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); + _thunar_return_if_fail (model->volume_monitor == volume_monitor); + _thunar_return_if_fail (G_IS_VOLUME (volume)); + _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model)); + ++ /* check that the volume is not in the internal list already */ ++ if (g_list_find (model->hidden_volumes, volume) != NULL) ++ return; ++ ++ /* nor in the list of visible volumes */ ++ for (idx = 0, lp = model->shortcuts; lp != NULL; ++idx, lp = lp->next) ++ { ++ if (THUNAR_SHORTCUT (lp->data)->volume == volume) ++ return; ++ } ++ + /* place the volume on the hidden list */ + model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); + +diff -uprb Thunar-1.4.0.orig/thunar/thunar-tree-model.c Thunar-1.4.0/thunar/thunar-tree-model.c +--- Thunar-1.4.0.orig/thunar/thunar-tree-model.c 2012-11-03 07:42:39.000000000 +0200 ++++ Thunar-1.4.0/thunar/thunar-tree-model.c 2012-11-03 08:09:36.000000000 +0200 +@@ -1127,11 +1127,26 @@ thunar_tree_model_volume_added (GVolumeM + GVolume *volume, + ThunarTreeModel *model) + { ++ ThunarTreeModelItem *item = NULL; ++ GNode *node; ++ + _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor)); + _thunar_return_if_fail (model->volume_monitor == volume_monitor); + _thunar_return_if_fail (G_IS_VOLUME (volume)); + _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model)); + ++ /* check that the volume is not in the internal list already */ ++ if (g_list_find (model->hidden_volumes, volume) != NULL) ++ return; ++ ++ /* nor in the list of visible volumes */ ++ for (node = model->root->children; node != NULL; node = node->next) ++ { ++ item = THUNAR_TREE_MODEL_ITEM (node->data); ++ if (item->volume == volume) ++ return; ++ } ++ + /* place the volume on the hidden list */ + model->hidden_volumes = g_list_prepend (model->hidden_volumes, g_object_ref (volume)); + Deleted: extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch =================================================================== --- extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch 2012-11-03 06:32:00 UTC (rev 170121) +++ extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch 2012-11-03 06:32:33 UTC (rev 170122) @@ -1,15 +0,0 @@ -diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c ---- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300 -+++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300 -@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol - has_media = g_drive_has_media (drive); - g_object_unref (drive); - } -+ else -+ { -+ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */ -+ has_media = g_volume_can_mount (volume); -+ } - - mount = g_volume_get_mount (volume); - if (mount != NULL) Copied: thunar/repos/extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch (from rev 170121, thunar/trunk/thunar-1.4.0-show-loop-devices-hack.patch) =================================================================== --- extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch (rev 0) +++ extra-x86_64/thunar-1.4.0-show-loop-devices-hack.patch 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,15 @@ +diff -upr Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c Thunar-1.4.0/thunar/thunar-gio-extensions.c +--- Thunar-1.4.0.orig/thunar/thunar-gio-extensions.c 2012-05-26 07:03:39.000000000 +0300 ++++ Thunar-1.4.0/thunar/thunar-gio-extensions.c 2012-05-26 07:05:06.000000000 +0300 +@@ -550,6 +550,11 @@ thunar_g_volume_is_present (GVolume *vol + has_media = g_drive_has_media (drive); + g_object_unref (drive); + } ++ else ++ { ++ /* XXX: hack to show loop devices with gvfs 1.12 / udisks2 */ ++ has_media = g_volume_can_mount (volume); ++ } + + mount = g_volume_get_mount (volume); + if (mount != NULL) Deleted: extra-x86_64/thunar.install =================================================================== --- extra-x86_64/thunar.install 2012-11-03 06:32:00 UTC (rev 170121) +++ extra-x86_64/thunar.install 2012-11-03 06:32:33 UTC (rev 170122) @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: thunar/repos/extra-x86_64/thunar.install (from rev 170121, thunar/trunk/thunar.install) =================================================================== --- extra-x86_64/thunar.install (rev 0) +++ extra-x86_64/thunar.install 2012-11-03 06:32:33 UTC (rev 170122) @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: