summaryrefslogtreecommitdiff
path: root/extra/nautilus
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-28 17:20:00 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-28 17:20:00 -0300
commit6575af67294a57126aa9408ee255db0e7be47bcd (patch)
tree0ebeb47514aec8981445ad7404d961ade8a41dc7 /extra/nautilus
parent15715eb69d409c77752f91aa6d8080ecc0262af6 (diff)
parentedec45419def1b81bd663a2859684ef55ba56269 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/collectd/PKGBUILD community-testing/collectd/install community-testing/collectd/libperl.patch community-testing/collectd/rc.d community-testing/collectd/rtnl_dump_filter.patch community-testing/freeradius/PKGBUILD community-testing/freeradius/freeradius.install community-testing/freeradius/krb5-build-fix.patch community-testing/freeradius/radiusd community-testing/inn/PKGBUILD community-testing/inn/inn.install community-testing/inn/innd.conf community-testing/inn/innd.rc community-testing/inn/nnrpd.conf community-testing/inn/nnrpd.rc community-testing/inn/site.make.patch community-testing/libvirt/PKGBUILD community-testing/linux-tools/PKGBUILD community-testing/linux-tools/cpupower.conf community-testing/linux-tools/cpupower.rc community-testing/linux-tools/cpupower.service community-testing/perl-berkeleydb/PKGBUILD community-testing/perl-class-methodmaker/PKGBUILD community-testing/perl-clone/PKGBUILD community-testing/perl-crypt-blowfish/PKGBUILD community-testing/perl-crypt-des/PKGBUILD community-testing/perl-curses/PKGBUILD community-testing/perl-data-structure-util/PKGBUILD community-testing/perl-datetime/PKGBUILD community-testing/perl-device-serialport/PKGBUILD community-testing/perl-file-rsyncp/PKGBUILD community-testing/perl-fuse/PKGBUILD community-testing/perl-gd/PKGBUILD community-testing/perl-gssapi/PKGBUILD community-testing/perl-html-strip/PKGBUILD community-testing/perl-inline-java/PKGBUILD community-testing/perl-io-dirent/PKGBUILD community-testing/perl-io-tty/PKGBUILD community-testing/perl-json-xs/PKGBUILD community-testing/perl-libapreq2/PKGBUILD community-testing/perl-mail-box-parser-c/PKGBUILD community-testing/perl-mail-transport-dbx/PKGBUILD community-testing/perl-net-dbus/PKGBUILD community-testing/perl-net-libidn/PKGBUILD community-testing/perl-params-classify/PKGBUILD community-testing/perl-params-validate/PKGBUILD community-testing/perl-string-crc32/PKGBUILD community-testing/perl-text-charwidth/PKGBUILD community-testing/perl-text-kakasi/ChangeLog community-testing/perl-text-kakasi/PKGBUILD community-testing/perl-tie-hash-indexed/PKGBUILD community-testing/perl-www-curl/PKGBUILD community-testing/perl-xmms/PKGBUILD community-testing/pork/PKGBUILD community-testing/rxvt-unicode/PKGBUILD community-testing/rxvt-unicode/urxvt-tabbed.desktop community-testing/rxvt-unicode/urxvt.desktop community-testing/rxvt-unicode/urxvtc.desktop community-testing/znc/PKGBUILD community/blackbox/PKGBUILD community/ccrtp/PKGBUILD community/gambas2/poppler-0.20.patch community/gambas3/poppler-0-20.patch community/libunistring/PKGBUILD community/libzrtpcpp/PKGBUILD community/mplayer2/PKGBUILD community/pdf2djvu/poppler-0.20.patch community/sword/PKGBUILD community/xiphos/PKGBUILD core/procps/PKGBUILD extra/dvdrip/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/inkscape/poppler20.patch extra/iperf/PKGBUILD extra/libreoffice/PKGBUILD extra/libreoffice/fix_broken_hebrew_wordwrapping.diff extra/libreoffice/libreoffice-base.install extra/libreoffice/libreoffice-calc.install extra/libreoffice/libreoffice-common.install extra/libreoffice/libreoffice-draw.install extra/libreoffice/libreoffice-impress.install extra/libreoffice/libreoffice-writer.install extra/mail-notification/PKGBUILD extra/nxserver/PKGBUILD extra/php-suhosin/PKGBUILD extra/poppler/PKGBUILD extra/streamtuner/PKGBUILD extra/systemd/PKGBUILD extra/tunepimp/PKGBUILD mozilla-testing/iceweasel-libre/iceweasel.install multilib/wine/PKGBUILD staging/gimp-devel/gimp-devel.install testing/consolekit/PKGBUILD testing/cryptsetup/PKGBUILD testing/cryptsetup/encrypt_hook testing/cryptsetup/encrypt_install testing/dmraid/PKGBUILD testing/dmraid/dmraid_install testing/graphviz/PKGBUILD testing/imagemagick/PKGBUILD testing/imagemagick/perlmagick.rpath.patch testing/irssi/PKGBUILD testing/kdebindings-perlkde/PKGBUILD testing/kdebindings-perlqt/PKGBUILD testing/lvm2/PKGBUILD testing/lvm2/lvm2_hook testing/lvm2/lvm2_install testing/mdadm/PKGBUILD testing/mdadm/mdadm_install testing/mdadm/mdadm_udev_install testing/mkinitcpio-nfs-utils/PKGBUILD testing/net-snmp/snmpd.rc testing/perl-bit-vector/PKGBUILD testing/perl-compress-bzip2/PKGBUILD testing/perl-crypt-openssl-bignum/PKGBUILD testing/perl-crypt-openssl-random/PKGBUILD testing/perl-crypt-openssl-rsa/PKGBUILD testing/perl-crypt-ssleay/PKGBUILD testing/perl-dbd-mysql/PKGBUILD testing/perl-dbi/PKGBUILD testing/perl-fcgi/PKGBUILD testing/perl-locale-gettext/PKGBUILD testing/perl-locale-gettext/compatibility-with-POSIX-module.patch testing/perl-net-ssleay/PKGBUILD testing/perl-time-hires/PKGBUILD testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch testing/perl/ChangeLog testing/perl/PKGBUILD testing/perl/digest_eval_hole.diff testing/perl/fix-h2ph-and-tests.patch testing/perl/perl.install testing/perl/perlbin.csh testing/perl/perlbin.sh testing/perl/provides.pl testing/php/PKGBUILD testing/php/logrotate.d.php-fpm testing/php/rc.d.php-fpm testing/pidgin/pidgin.install testing/pinentry/pinentry.install testing/postgresql/postgresql.pam testing/slim/logrotate testing/subversion/PKGBUILD testing/vim/PKGBUILD testing/vim/archlinux.vim testing/vim/gvim.desktop testing/vim/gvim.install testing/vim/vimrc testing/weechat/PKGBUILD testing/xf86-video-ati/PKGBUILD testing/xf86-video-intel/PKGBUILD testing/xf86-video-nouveau/PKGBUILD testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/nautilus')
-rw-r--r--extra/nautilus/samba-crash.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/extra/nautilus/samba-crash.patch b/extra/nautilus/samba-crash.patch
deleted file mode 100644
index b10d39008..000000000
--- a/extra/nautilus/samba-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Fri, 04 May 2012 18:38:43 +0000
-Subject: places-sidebar: don't double unref GMount objects
-
-Fixes a lot of reported crashers with NFS/Samba volumes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=674659
----
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index 61f3658..672a4b0 100644
---- a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar)
- root = g_mount_get_default_location (mount);
-
- if (!g_file_is_native (root)) {
-- network_mounts = g_list_prepend (network_mounts, g_object_ref (mount));
-+ network_mounts = g_list_prepend (network_mounts, mount);
- continue;
- }
-
-@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar)
- name, icon, mount_uri,
- NULL, NULL, mount, 0, tooltip);
- g_object_unref (root);
-- g_object_unref (mount);
- g_object_unref (icon);
- g_free (name);
- g_free (mount_uri);
---
-cgit v0.9.0.2