[arch-commits] Commit in xfdesktop/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, November 6, 2012 @ 06:49:02
  Author: foutrelis
Revision: 170255

upgpkg: xfdesktop 4.10.0-5

Remove workaround now that GVFS is patched for FS#32325: Duplicate entries for mounted volumes in file manager

Modified:
  xfdesktop/trunk/PKGBUILD
Deleted:
  xfdesktop/trunk/avoid-duplicating-volume-icons.patch

--------------------------------------+
 PKGBUILD                             |   13 +++----------
 avoid-duplicating-volume-icons.patch |   29 -----------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-06 11:47:03 UTC (rev 170254)
+++ PKGBUILD	2012-11-06 11:49:02 UTC (rev 170255)
@@ -4,7 +4,7 @@
 
 pkgname=xfdesktop
 pkgver=4.10.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -17,11 +17,9 @@
 options=('!libtool')
 install=xfdesktop.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        add-backgrounds-xfce-to-search-path.patch
-        avoid-duplicating-volume-icons.patch)
+        add-backgrounds-xfce-to-search-path.patch)
 sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
-            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5'
-            'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b')
+            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -30,11 +28,6 @@
   # https://bugzilla.xfce.org/show_bug.cgi?id=8799
   patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
 
-  # Workaround for GVFS 1.14.0 which emits volume-added signals for
-  # pre-existing volumes.
-  # https://bugzilla.xfce.org/show_bug.cgi?id=9464
-  patch -Np1 -i "$srcdir/avoid-duplicating-volume-icons.patch"
-
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \

Deleted: avoid-duplicating-volume-icons.patch
===================================================================
--- avoid-duplicating-volume-icons.patch	2012-11-06 11:47:03 UTC (rev 170254)
+++ avoid-duplicating-volume-icons.patch	2012-11-06 11:49:02 UTC (rev 170255)
@@ -1,29 +0,0 @@
-From 7b8b5cb05bd870549dee2d159e246ce58e325b7f Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos at foutrelis.com>
-Date: Tue, 6 Nov 2012 00:10:48 +0200
-Subject: [PATCH] Avoid duplicating volume icons
-
-This is a workaround for GVFS 1.14.0 which emits volume-added signals
-for pre-existing volumes.
----
- src/xfdesktop-file-icon-manager.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
-index 72b6d09..e039cb8 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -2521,6 +2521,10 @@ xfdesktop_file_icon_manager_volume_added(GVolumeMonitor *monitor,
- {
-     XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
- 
-+    /* avoid duplicating volume icons -- workaround for GVFS 1.14.0 */
-+    if (g_hash_table_lookup(fmanager->priv->removable_icons, volume))
-+        return;
-+
-     xfdesktop_file_icon_manager_add_removable_volume(fmanager, volume);
- }
- 
--- 
-1.8.0
-