summaryrefslogtreecommitdiff
path: root/gtk/gtkfilechooserentry.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-11-03 15:13:17 +0100
committerBenjamin Otte <otte@redhat.com>2011-12-16 20:09:11 +0100
commita04b70e51fdda52fc88a174c69a754ed89a95081 (patch)
tree2145f3be966080b378429a74f7ab1909dca6f265 /gtk/gtkfilechooserentry.c
parent05398b8f1a62ab1980b01b68fca122785e2a198a (diff)
downloadgtk+-a04b70e51fdda52fc88a174c69a754ed89a95081.tar.gz
filechooserentry: The file system cannot be NULL
Remove code that checked this.
Diffstat (limited to 'gtk/gtkfilechooserentry.c')
-rw-r--r--gtk/gtkfilechooserentry.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 6e74130197..306ea66a08 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1462,9 +1462,6 @@ out:
static RefreshStatus
start_loading_current_folder (GtkFileChooserEntry *chooser_entry)
{
- if (chooser_entry->file_system == NULL)
- return REFRESH_OK;
-
g_assert (chooser_entry->current_folder_file != NULL);
g_assert (chooser_entry->current_folder == NULL);
g_assert (chooser_entry->load_folder_cancellable == NULL);
@@ -1542,8 +1539,7 @@ refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
text = gtk_editable_get_chars (editable, 0, end_pos);
error = NULL;
- if (!chooser_entry->file_system ||
- !_gtk_file_system_parse (chooser_entry->file_system,
+ if (!_gtk_file_system_parse (chooser_entry->file_system,
chooser_entry->base_folder, text,
&folder_file, &file_part, &error))
{