[gtk+/multiroot-filechooser-2-20: 17/21] Remove superfluous NULL check



commit b7ca7b7688fa7b977458bb9128eb371c656d3f93
Author: Federico Mena Quintero <federico novell com>
Date:   Thu Jun 24 15:00:44 2010 -0500

    Remove superfluous NULL check
    
    Now that _gtk_file_chooser_uri_has_prefix() deals with NULL prefix lists,
    we can remove all such checks.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 gtk/gtkfilechooserentry.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 0fd631f..ec2b085 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1482,9 +1482,8 @@ start_loading_current_folder (GtkFileChooserEntry *chooser_entry)
   g_assert (chooser_entry->load_folder_cancellable == NULL);
 
   if ((chooser_entry->local_only
-       && !g_file_is_native (chooser_entry->current_folder_file)) ||
-      (chooser_entry->root_uris != NULL
-       && !is_file_in_roots (chooser_entry, chooser_entry->current_folder_file)))
+       && !g_file_is_native (chooser_entry->current_folder_file))
+      || !is_file_in_roots (chooser_entry, chooser_entry->current_folder_file))
     {
       g_object_unref (chooser_entry->current_folder_file);
       chooser_entry->current_folder_file = NULL;



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