summaryrefslogtreecommitdiff
path: root/gtk/gtkfilechooserprivate.h
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtkfilechooserprivate.h')
-rw-r--r--gtk/gtkfilechooserprivate.h86
1 files changed, 43 insertions, 43 deletions
diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index 7a1522bd8e..d5a19c275b 100644
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -47,20 +47,20 @@ struct _GtkFileChooserIface
/* Methods
*/
gboolean (*set_current_folder) (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
- GtkFilePath * (*get_current_folder) (GtkFileChooser *chooser);
+ GFile * (*get_current_folder) (GtkFileChooser *chooser);
void (*set_current_name) (GtkFileChooser *chooser,
const gchar *name);
- gboolean (*select_path) (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ gboolean (*select_file) (GtkFileChooser *chooser,
+ GFile *file,
GError **error);
- void (*unselect_path) (GtkFileChooser *chooser,
- const GtkFilePath *path);
+ void (*unselect_file) (GtkFileChooser *chooser,
+ GFile *file);
void (*select_all) (GtkFileChooser *chooser);
void (*unselect_all) (GtkFileChooser *chooser);
- GSList * (*get_paths) (GtkFileChooser *chooser);
- GtkFilePath * (*get_preview_path) (GtkFileChooser *chooser);
+ GSList * (*get_files) (GtkFileChooser *chooser);
+ GFile * (*get_preview_file) (GtkFileChooser *chooser);
GtkFileSystem *(*get_file_system) (GtkFileChooser *chooser);
void (*add_filter) (GtkFileChooser *chooser,
GtkFileFilter *filter);
@@ -68,10 +68,10 @@ struct _GtkFileChooserIface
GtkFileFilter *filter);
GSList * (*list_filters) (GtkFileChooser *chooser);
gboolean (*add_shortcut_folder) (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
gboolean (*remove_shortcut_folder) (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
GSList * (*list_shortcut_folders) (GtkFileChooser *chooser);
@@ -85,22 +85,22 @@ struct _GtkFileChooserIface
};
GtkFileSystem *_gtk_file_chooser_get_file_system (GtkFileChooser *chooser);
-gboolean _gtk_file_chooser_set_current_folder_path (GtkFileChooser *chooser,
- const GtkFilePath *path,
+gboolean _gtk_file_chooser_set_current_folder_file (GtkFileChooser *chooser,
+ GFile *file,
GError **error);
-GtkFilePath * _gtk_file_chooser_get_current_folder_path (GtkFileChooser *chooser);
-gboolean _gtk_file_chooser_select_path (GtkFileChooser *chooser,
- const GtkFilePath *path,
+GFile * _gtk_file_chooser_get_current_folder_file (GtkFileChooser *chooser);
+gboolean _gtk_file_chooser_select_file (GtkFileChooser *chooser,
+ GFile *file,
GError **error);
-void _gtk_file_chooser_unselect_path (GtkFileChooser *chooser,
- const GtkFilePath *path);
-GSList * _gtk_file_chooser_get_paths (GtkFileChooser *chooser);
-GtkFilePath * _gtk_file_chooser_get_preview_path (GtkFileChooser *chooser);
+void _gtk_file_chooser_unselect_file (GtkFileChooser *chooser,
+ GFile *file);
+GSList * _gtk_file_chooser_get_files (GtkFileChooser *chooser);
+GFile * _gtk_file_chooser_get_preview_file (GtkFileChooser *chooser);
gboolean _gtk_file_chooser_add_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *folder,
GError **error);
gboolean _gtk_file_chooser_remove_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *folder,
GError **error);
/* GtkFileChooserDialog private */
@@ -232,15 +232,15 @@ struct _GtkFileChooserDefault
/* Handles */
GSList *loading_shortcuts;
- GSList *reload_icon_handles;
- GtkFileSystemHandle *file_list_drag_data_received_handle;
- GtkFileSystemHandle *update_current_folder_handle;
- GtkFileSystemHandle *show_and_select_paths_handle;
- GtkFileSystemHandle *should_respond_get_info_handle;
- GtkFileSystemHandle *file_exists_get_info_handle;
- GtkFileSystemHandle *update_from_entry_handle;
- GtkFileSystemHandle *shortcuts_activate_iter_handle;
- GSList *pending_handles;
+ GSList *reload_icon_cancellables;
+ GCancellable *file_list_drag_data_received_cancellable;
+ GCancellable *update_current_folder_cancellable;
+ GCancellable *show_and_select_files_cancellable;
+ GCancellable *should_respond_get_info_cancellable;
+ GCancellable *file_exists_get_info_cancellable;
+ GCancellable *update_from_entry_cancellable;
+ GCancellable *shortcuts_activate_iter_cancellable;
+ GSList *pending_cancellables;
LoadState load_state;
ReloadState reload_state;
@@ -248,7 +248,7 @@ struct _GtkFileChooserDefault
OperationMode operation_mode;
- GSList *pending_select_paths;
+ GSList *pending_select_files;
GtkFileFilter *current_filter;
GSList *filters;
@@ -262,9 +262,9 @@ struct _GtkFileChooserDefault
gulong volumes_changed_id;
gulong bookmarks_changed_id;
- GtkFilePath *current_volume_path;
- GtkFilePath *current_folder;
- GtkFilePath *preview_path;
+ GFile *current_volume_file;
+ GFile *current_folder;
+ GFile *preview_file;
char *preview_display_name;
GtkTreeViewColumn *list_name_column;
@@ -320,10 +320,10 @@ struct _GtkFileSystemModel
GObject parent_instance;
GtkFileSystem *file_system;
- GtkFileInfoType types;
+ gchar *attributes;
FileModelNode *roots;
- GtkFileFolder *root_folder;
- GtkFilePath *root_path;
+ GtkFolder *root_folder;
+ GFile *root_file;
GtkFileSystemModelFilter filter_func;
gpointer filter_data;
@@ -333,8 +333,8 @@ struct _GtkFileSystemModel
gushort max_depth;
- GSList *pending_handles;
-
+ GSList *pending_cancellables;
+
guint show_hidden : 1;
guint show_folders : 1;
guint show_files : 1;
@@ -344,12 +344,12 @@ struct _GtkFileSystemModel
struct _FileModelNode
{
- GtkFilePath *path;
+ GFile *file;
FileModelNode *next;
- GtkFileInfo *info;
- GtkFileFolder *folder;
-
+ GFileInfo *info;
+ GtkFolder *folder;
+
FileModelNode *children;
FileModelNode *parent;
GtkFileSystemModel *model;