Accepting request 200485 from home:dimstar:branches:GNOME:Factory

- Add gnome-user-share-downloads-nautilus-crash.patch: Do not
  crash nautilus when entering 'Downloads' location (bnc#841659,
  bgo#708530, bgo#708456).

OBS-URL: https://build.opensuse.org/request/show/200485
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-user-share?expand=0&rev=69

gnome-user-share-downloads-nautilus-crash.patch

@@ -0,0 +1,30 @@
+From 58fa6cff7fd9f4e59d5b1537794b5995b6de5d63 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Tue, 24 Sep 2013 23:26:04 +0200
+Subject: [PATCH] trivial: fix logic error
+
+The bar should become visible if we are EITHER in Downloads OR in
+PUBLIC.
+
+Fixes bug 708456, which is about very strange crashes when entering
+'Downloads'
+---
+ src/share-extension.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/share-extension.c b/src/share-extension.c
+index c1654d4..bac2ac2 100644
+--- a/src/share-extension.c
++++ b/src/share-extension.c
+@@ -153,7 +153,7 @@ nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface,
+ 	if (enable == FALSE)
+ 		return NULL;
+ 
+-	if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
++	if (is_dir[0] != FALSE || is_dir[1] != FALSE) {
+ 		bar = nautilus_share_bar_new (_("May be used to share or receive files"));
+ 	} else if (is_dir[0] != FALSE) {
+ #ifndef HAVE_BLUETOOTH
+-- 
+1.8.4
+

gnome-user-share.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 24 21:32:18 UTC 2013 - dimstar@opensuse.org
+
+- Add gnome-user-share-downloads-nautilus-crash.patch: Do not
+  crash nautilus when entering 'Downloads' location (bnc#841659,
+  bgo#708530, bgo#708456).
+
 -------------------------------------------------------------------
 Tue Sep 24 13:45:59 UTC 2013 - dimstar@opensuse.org
 

gnome-user-share.spec

@@ -24,6 +24,8 @@ License:        GPL-2.0+
 Group:          Productivity/Networking/File-Sharing
 Url:            http://www.gnome.org/
 Source:         http://download.gnome.org/sources/gnome-user-share/3.10/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-user-share-downloads-nautilus-crash.patch bnc#841659 bgo#708530 bgo#708456 dimstar@opensuse.org --  Do not crash nautilus when entering 'Downloads' location
+Patch0:         gnome-user-share-downloads-nautilus-crash.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
@@ -61,6 +63,7 @@ The program also allows to share files using ObexFTP over Bluetooth.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 
 %build