rpm/gnome-user-share
SHA256
1
0
Fork 0
forked from pool/gnome-user-share
Code Pull Requests Activity

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

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2013-09-25 15:26:18 +00:00 committed by Git OBS Bridge
parent 97f8e38ce9
commit 1fe311996c
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnome-user-share-downloads-nautilus-crash.patch Normal file
View File

@ -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

7
gnome-user-share.changes
View File

@ -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

3
gnome-user-share.spec
View File

@ -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