[nautilus/gnome-3-16] Revert "nautilus-bookmark: don't crash if file is gone" This was a wrong fix and it's only needed on



commit eb9a452d39004662ed337243047c378cddeaaf7c
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Dec 2 12:04:28 2015 +0100

    Revert "nautilus-bookmark: don't crash if file is gone"
    This was a wrong fix and it's only needed on 3.14
    
    This reverts commit 4c56f31c0ad6c94a5851ef8b9f0142acfdabf4ad.

 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 e374fc6..2655f48 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -346,14 +346,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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]