diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2015-10-06 17:09:00 +0200 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-10-06 17:09:00 +0200 |
| commit | 07719c951f9d4d077a990590e845b22a521f5ab8 (patch) | |
| tree | 6819fbd568ac1ba641a0e9a67290803b57c6e600 | |
| parent | 44de344af0564a319fbfee1dc8d5d64a75add2b9 (diff) | |
| download | nautilus-07719c951f9d4d077a990590e845b22a521f5ab8.tar.gz | |
Revert "nautilus-bookmark: don't crash if file is gone"
This reverts commit 9429c94f354460e7bcc2a9063b98f3a904e6a358.
This was a blind fix, and it's not correct. Correct one is only
need on 3.14 with commit a0cbf72827b87a28fba47988957001a8b4fbddf5
| -rw-r--r-- | libnautilus-private/nautilus-bookmark.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 284b8f770..e4bb5db8c 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -348,14 +348,7 @@ nautilus_bookmark_connect_file (NautilusBookmark *bookmark) DEBUG ("%s: creating file", nautilus_bookmark_get_name (bookmark)); bookmark->details->file = nautilus_file_get (bookmark->details->location); - /* Similar to what we do when a file has been trashed or deleted - * withouth noticing in bookmark_changed, just try to fall graciously. - */ - if (nautilus_file_is_gone (bookmark->details->file)) - { - nautilus_bookmark_disconnect_file (bookmark); - return; - } + g_assert (!nautilus_file_is_gone (bookmark->details->file)); g_signal_connect_object (bookmark->details->file, "changed", G_CALLBACK (bookmark_file_changed_callback), bookmark, 0); |