[arch-commits] Commit in xfdesktop/repos (14 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Nov 6 11:49:29 UTC 2012
Date: Tuesday, November 6, 2012 @ 06:49:29
Author: foutrelis
Revision: 170256
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfdesktop/repos/extra-i686/PKGBUILD
(from rev 170255, xfdesktop/trunk/PKGBUILD)
xfdesktop/repos/extra-i686/add-backgrounds-xfce-to-search-path.patch
(from rev 170255, xfdesktop/trunk/add-backgrounds-xfce-to-search-path.patch)
xfdesktop/repos/extra-i686/xfdesktop.install
(from rev 170255, xfdesktop/trunk/xfdesktop.install)
xfdesktop/repos/extra-x86_64/PKGBUILD
(from rev 170255, xfdesktop/trunk/PKGBUILD)
xfdesktop/repos/extra-x86_64/add-backgrounds-xfce-to-search-path.patch
(from rev 170255, xfdesktop/trunk/add-backgrounds-xfce-to-search-path.patch)
xfdesktop/repos/extra-x86_64/xfdesktop.install
(from rev 170255, xfdesktop/trunk/xfdesktop.install)
Deleted:
xfdesktop/repos/extra-i686/PKGBUILD
xfdesktop/repos/extra-i686/add-backgrounds-xfce-to-search-path.patch
xfdesktop/repos/extra-i686/avoid-duplicating-volume-icons.patch
xfdesktop/repos/extra-i686/xfdesktop.install
xfdesktop/repos/extra-x86_64/PKGBUILD
xfdesktop/repos/extra-x86_64/add-backgrounds-xfce-to-search-path.patch
xfdesktop/repos/extra-x86_64/avoid-duplicating-volume-icons.patch
xfdesktop/repos/extra-x86_64/xfdesktop.install
--------------------------------------------------------+
extra-i686/PKGBUILD | 105 +++++++--------
extra-i686/add-backgrounds-xfce-to-search-path.patch | 72 +++++-----
extra-i686/avoid-duplicating-volume-icons.patch | 29 ----
extra-i686/xfdesktop.install | 26 +--
extra-x86_64/PKGBUILD | 105 +++++++--------
extra-x86_64/add-backgrounds-xfce-to-search-path.patch | 72 +++++-----
extra-x86_64/avoid-duplicating-volume-icons.patch | 29 ----
extra-x86_64/xfdesktop.install | 26 +--
8 files changed, 196 insertions(+), 268 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-i686/PKGBUILD 2012-11-06 11:49:29 UTC (rev 170256)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfdesktop
-pkgver=4.10.0
-pkgrel=4
-pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool')
-conflicts=('xfce4-menueditor')
-replaces=('xfce4-menueditor')
-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)
-sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
- 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5'
- 'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Add backgrounds/xfce/ to the single image list in the settings app
- # 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 \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-thunarx \
- --enable-notifications \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfdesktop/repos/extra-i686/PKGBUILD (from rev 170255, xfdesktop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-11-06 11:49:29 UTC (rev 170256)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.10.0
+pkgrel=5
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool')
+conflicts=('xfce4-menueditor')
+replaces=('xfce4-menueditor')
+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)
+sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
+ 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Add backgrounds/xfce/ to the single image list in the settings app
+ # https://bugzilla.xfce.org/show_bug.cgi?id=8799
+ patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gio-unix \
+ --enable-thunarx \
+ --enable-notifications \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/add-backgrounds-xfce-to-search-path.patch
===================================================================
--- extra-i686/add-backgrounds-xfce-to-search-path.patch 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-i686/add-backgrounds-xfce-to-search-path.patch 2012-11-06 11:49:29 UTC (rev 170256)
@@ -1,36 +0,0 @@
-@@ -, +, @@
- settings app. (Bug #8799)
----
- settings/main.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
---- a/settings/main.c
-+++ a/settings/main.c
-@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
- xfconf_channel_set_string(panel->channel, prop_image, image_file);
- xfconf_channel_set_string(panel->channel, prop_last, image_file);
-
-+ /* Add all backdrops in xfce4/backdrops/ */
- backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
- "xfce4/backdrops/");
- for(i = 0; backdrop_dirs[i]; ++i) {
-@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
- if(tmp)
- image_file_iter = tmp;
- }
-+ g_strfreev(backdrop_dirs);
-+
-+ /* Add all backdrops in backgrounds/xfce/ */
-+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
-+ "backgrounds/xfce/");
-+ for(i = 0; backdrop_dirs[i]; ++i) {
-+ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
-+ image_file);
-+ if(tmp)
-+ image_file_iter = tmp;
-+ }
-+ g_strfreev(backdrop_dirs);
-+
-
- if(!image_file_iter)
- image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
---
Copied: xfdesktop/repos/extra-i686/add-backgrounds-xfce-to-search-path.patch (from rev 170255, xfdesktop/trunk/add-backgrounds-xfce-to-search-path.patch)
===================================================================
--- extra-i686/add-backgrounds-xfce-to-search-path.patch (rev 0)
+++ extra-i686/add-backgrounds-xfce-to-search-path.patch 2012-11-06 11:49:29 UTC (rev 170256)
@@ -0,0 +1,36 @@
+@@ -, +, @@
+ settings app. (Bug #8799)
+---
+ settings/main.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+--- a/settings/main.c
++++ a/settings/main.c
+@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
+ xfconf_channel_set_string(panel->channel, prop_image, image_file);
+ xfconf_channel_set_string(panel->channel, prop_last, image_file);
+
++ /* Add all backdrops in xfce4/backdrops/ */
+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
+ "xfce4/backdrops/");
+ for(i = 0; backdrop_dirs[i]; ++i) {
+@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
+ if(tmp)
+ image_file_iter = tmp;
+ }
++ g_strfreev(backdrop_dirs);
++
++ /* Add all backdrops in backgrounds/xfce/ */
++ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
++ "backgrounds/xfce/");
++ for(i = 0; backdrop_dirs[i]; ++i) {
++ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
++ image_file);
++ if(tmp)
++ image_file_iter = tmp;
++ }
++ g_strfreev(backdrop_dirs);
++
+
+ if(!image_file_iter)
+ image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
+--
Deleted: extra-i686/avoid-duplicating-volume-icons.patch
===================================================================
--- extra-i686/avoid-duplicating-volume-icons.patch 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-i686/avoid-duplicating-volume-icons.patch 2012-11-06 11:49:29 UTC (rev 170256)
@@ -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
-
Deleted: extra-i686/xfdesktop.install
===================================================================
--- extra-i686/xfdesktop.install 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-i686/xfdesktop.install 2012-11-06 11:49:29 UTC (rev 170256)
@@ -1,13 +0,0 @@
-post_install() {
- 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: xfdesktop/repos/extra-i686/xfdesktop.install (from rev 170255, xfdesktop/trunk/xfdesktop.install)
===================================================================
--- extra-i686/xfdesktop.install (rev 0)
+++ extra-i686/xfdesktop.install 2012-11-06 11:49:29 UTC (rev 170256)
@@ -0,0 +1,13 @@
+post_install() {
+ 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-06 11:49:02 UTC (rev 170255)
+++ extra-x86_64/PKGBUILD 2012-11-06 11:49:29 UTC (rev 170256)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfdesktop
-pkgver=4.10.0
-pkgrel=4
-pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool')
-conflicts=('xfce4-menueditor')
-replaces=('xfce4-menueditor')
-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)
-sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
- 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5'
- 'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Add backgrounds/xfce/ to the single image list in the settings app
- # 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 \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-gio-unix \
- --enable-thunarx \
- --enable-notifications \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfdesktop/repos/extra-x86_64/PKGBUILD (from rev 170255, xfdesktop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-11-06 11:49:29 UTC (rev 170256)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.10.0
+pkgrel=5
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool')
+conflicts=('xfce4-menueditor')
+replaces=('xfce4-menueditor')
+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)
+sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
+ 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Add backgrounds/xfce/ to the single image list in the settings app
+ # https://bugzilla.xfce.org/show_bug.cgi?id=8799
+ patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gio-unix \
+ --enable-thunarx \
+ --enable-notifications \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/add-backgrounds-xfce-to-search-path.patch
===================================================================
--- extra-x86_64/add-backgrounds-xfce-to-search-path.patch 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-x86_64/add-backgrounds-xfce-to-search-path.patch 2012-11-06 11:49:29 UTC (rev 170256)
@@ -1,36 +0,0 @@
-@@ -, +, @@
- settings app. (Bug #8799)
----
- settings/main.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
---- a/settings/main.c
-+++ a/settings/main.c
-@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
- xfconf_channel_set_string(panel->channel, prop_image, image_file);
- xfconf_channel_set_string(panel->channel, prop_last, image_file);
-
-+ /* Add all backdrops in xfce4/backdrops/ */
- backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
- "xfce4/backdrops/");
- for(i = 0; backdrop_dirs[i]; ++i) {
-@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
- if(tmp)
- image_file_iter = tmp;
- }
-+ g_strfreev(backdrop_dirs);
-+
-+ /* Add all backdrops in backgrounds/xfce/ */
-+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
-+ "backgrounds/xfce/");
-+ for(i = 0; backdrop_dirs[i]; ++i) {
-+ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
-+ image_file);
-+ if(tmp)
-+ image_file_iter = tmp;
-+ }
-+ g_strfreev(backdrop_dirs);
-+
-
- if(!image_file_iter)
- image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
---
Copied: xfdesktop/repos/extra-x86_64/add-backgrounds-xfce-to-search-path.patch (from rev 170255, xfdesktop/trunk/add-backgrounds-xfce-to-search-path.patch)
===================================================================
--- extra-x86_64/add-backgrounds-xfce-to-search-path.patch (rev 0)
+++ extra-x86_64/add-backgrounds-xfce-to-search-path.patch 2012-11-06 11:49:29 UTC (rev 170256)
@@ -0,0 +1,36 @@
+@@ -, +, @@
+ settings app. (Bug #8799)
+---
+ settings/main.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+--- a/settings/main.c
++++ a/settings/main.c
+@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
+ xfconf_channel_set_string(panel->channel, prop_image, image_file);
+ xfconf_channel_set_string(panel->channel, prop_last, image_file);
+
++ /* Add all backdrops in xfce4/backdrops/ */
+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
+ "xfce4/backdrops/");
+ for(i = 0; backdrop_dirs[i]; ++i) {
+@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel)
+ if(tmp)
+ image_file_iter = tmp;
+ }
++ g_strfreev(backdrop_dirs);
++
++ /* Add all backdrops in backgrounds/xfce/ */
++ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA,
++ "backgrounds/xfce/");
++ for(i = 0; backdrop_dirs[i]; ++i) {
++ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i],
++ image_file);
++ if(tmp)
++ image_file_iter = tmp;
++ }
++ g_strfreev(backdrop_dirs);
++
+
+ if(!image_file_iter)
+ image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file);
+--
Deleted: extra-x86_64/avoid-duplicating-volume-icons.patch
===================================================================
--- extra-x86_64/avoid-duplicating-volume-icons.patch 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-x86_64/avoid-duplicating-volume-icons.patch 2012-11-06 11:49:29 UTC (rev 170256)
@@ -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
-
Deleted: extra-x86_64/xfdesktop.install
===================================================================
--- extra-x86_64/xfdesktop.install 2012-11-06 11:49:02 UTC (rev 170255)
+++ extra-x86_64/xfdesktop.install 2012-11-06 11:49:29 UTC (rev 170256)
@@ -1,13 +0,0 @@
-post_install() {
- 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: xfdesktop/repos/extra-x86_64/xfdesktop.install (from rev 170255, xfdesktop/trunk/xfdesktop.install)
===================================================================
--- extra-x86_64/xfdesktop.install (rev 0)
+++ extra-x86_64/xfdesktop.install 2012-11-06 11:49:29 UTC (rev 170256)
@@ -0,0 +1,13 @@
+post_install() {
+ 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:
More information about the arch-commits
mailing list