diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index a6c28424ad..259e55687d 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -540,24 +540,6 @@ gtk_file_chooser_get_file (GtkFileChooser *chooser) return result; } -/*< private > - * _gtk_file_chooser_get_file_system: - * @chooser: a #GtkFileChooser - * - * Gets the #GtkFileSystem of @chooser; this is an internal - * implementation detail, used for conversion between paths - * and filenames and URIs. - * - * Returns: the file system for @chooser. - **/ -GtkFileSystem * -_gtk_file_chooser_get_file_system (GtkFileChooser *chooser) -{ - g_return_val_if_fail (GTK_IS_FILE_CHOOSER (chooser), NULL); - - return GTK_FILE_CHOOSER_GET_IFACE (chooser)->get_file_system (chooser); -} - /** * gtk_file_chooser_add_shortcut_folder: * @chooser: a #GtkFileChooser diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index 092d785eb9..2e96ff66e9 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -20,7 +20,6 @@ #define __GTK_FILE_CHOOSER_PRIVATE_H__ #include "gtkfilechooser.h" -#include "gtkfilesystem.h" #include "gtkfilesystemmodel.h" #include "gtkliststore.h" #include "gtkrecentmanager.h" @@ -73,7 +72,6 @@ struct _GtkFileChooserIface void (*select_all) (GtkFileChooser *chooser); void (*unselect_all) (GtkFileChooser *chooser); GListModel * (*get_files) (GtkFileChooser *chooser); - GtkFileSystem *(*get_file_system) (GtkFileChooser *chooser); void (*add_filter) (GtkFileChooser *chooser, GtkFileFilter *filter); void (*remove_filter) (GtkFileChooser *chooser, @@ -109,8 +107,6 @@ struct _GtkFileChooserIface const char *id); }; -GtkFileSystem *_gtk_file_chooser_get_file_system (GtkFileChooser *chooser); - void gtk_file_chooser_select_all (GtkFileChooser *chooser); void gtk_file_chooser_unselect_all (GtkFileChooser *chooser); gboolean gtk_file_chooser_select_file (GtkFileChooser *chooser, diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c index 4f5891fca8..d51e6f4051 100644 --- a/gtk/gtkfilechooserutils.c +++ b/gtk/gtkfilechooserutils.c @@ -20,7 +20,6 @@ #include "config.h" #include "gtkfilechooserutils.h" #include "gtkfilechooser.h" -#include "gtkfilesystem.h" #include "gtktypebuiltins.h" #include "gtkintl.h" @@ -40,7 +39,6 @@ static void delegate_unselect_file (GtkFileChooser *choose static void delegate_select_all (GtkFileChooser *chooser); static void delegate_unselect_all (GtkFileChooser *chooser); static GListModel * delegate_get_files (GtkFileChooser *chooser); -static GtkFileSystem *delegate_get_file_system (GtkFileChooser *chooser); static void delegate_add_filter (GtkFileChooser *chooser, GtkFileFilter *filter); static void delegate_remove_filter (GtkFileChooser *chooser, @@ -128,7 +126,6 @@ _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface) iface->select_all = delegate_select_all; iface->unselect_all = delegate_unselect_all; iface->get_files = delegate_get_files; - iface->get_file_system = delegate_get_file_system; iface->add_filter = delegate_add_filter; iface->remove_filter = delegate_remove_filter; iface->get_filters = delegate_get_filters; @@ -215,12 +212,6 @@ delegate_get_files (GtkFileChooser *chooser) return gtk_file_chooser_get_files (get_delegate (chooser)); } -static GtkFileSystem * -delegate_get_file_system (GtkFileChooser *chooser) -{ - return _gtk_file_chooser_get_file_system (get_delegate (chooser)); -} - static void delegate_add_filter (GtkFileChooser *chooser, GtkFileFilter *filter) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 33978ca42a..3520a2171b 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -480,7 +480,6 @@ static void gtk_file_chooser_widget_unselect_file (GtkF static void gtk_file_chooser_widget_select_all (GtkFileChooser *chooser); static void gtk_file_chooser_widget_unselect_all (GtkFileChooser *chooser); static GListModel * gtk_file_chooser_widget_get_files (GtkFileChooser *chooser); -static GtkFileSystem *gtk_file_chooser_widget_get_file_system (GtkFileChooser *chooser); static void gtk_file_chooser_widget_add_filter (GtkFileChooser *chooser, GtkFileFilter *filter); static void gtk_file_chooser_widget_remove_filter (GtkFileChooser *chooser, @@ -612,7 +611,6 @@ gtk_file_chooser_widget_iface_init (GtkFileChooserIface *iface) iface->select_all = gtk_file_chooser_widget_select_all; iface->unselect_all = gtk_file_chooser_widget_unselect_all; iface->get_files = gtk_file_chooser_widget_get_files; - iface->get_file_system = gtk_file_chooser_widget_get_file_system; iface->set_current_folder = gtk_file_chooser_widget_set_current_folder; iface->get_current_folder = gtk_file_chooser_widget_get_current_folder; iface->set_current_name = gtk_file_chooser_widget_set_current_name; @@ -5601,14 +5599,6 @@ gtk_file_chooser_widget_get_files (GtkFileChooser *chooser) return G_LIST_MODEL (info.result); } -static GtkFileSystem * -gtk_file_chooser_widget_get_file_system (GtkFileChooser *chooser) -{ - GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (chooser); - - return impl->file_system; -} - /* Shows or hides the filter widgets */ static void show_filters (GtkFileChooserWidget *impl,