remove GtkTooltips member from the GtkFileChooserDefault struct.

[~andy/gtk] / gtk / gtkfilesystemmodel.h

diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h
index 5c2d1f3ff32160ba74ec48a491afde90f3c118f2..664aaf2b3737b600acad23217d21d546da1d6ecb 100644 (file)
--- a/gtk/gtkfilesystemmodel.h
+++ b/gtk/gtkfilesystemmodel.h
@@ -33,21 +33,22 @@ G_BEGIN_DECLS
 
 typedef struct _GtkFileSystemModel      GtkFileSystemModel;
 
-GType _gtk_file_system_model_get_type (void);
+GType _gtk_file_system_model_get_type (void) G_GNUC_CONST;
 
-enum {
-  GTK_FILE_SYSTEM_MODEL_URI,
+typedef enum {
   GTK_FILE_SYSTEM_MODEL_INFO,
+  GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME,
   GTK_FILE_SYSTEM_MODEL_N_COLUMNS
 } GtkFileSystemModelColumns;
 
 GtkFileSystemModel *_gtk_file_system_model_new              (GtkFileSystem      *file_system,
-                                                            const gchar        *root_uri,
+                                                            GFile              *root_file,
                                                             gint                max_depth,
-                                                            GtkFileInfoType     types);
-const GtkFileInfo * _gtk_file_system_model_get_info         (GtkFileSystemModel *model,
+                                                            const gchar        *attributes,
+                                                            GError            **error);
+GFileInfo *         _gtk_file_system_model_get_info         (GtkFileSystemModel *model,
                                                             GtkTreeIter        *iter);
-const gchar *       _gtk_file_system_model_get_uri          (GtkFileSystemModel *model,
+GFile *             _gtk_file_system_model_get_file         (GtkFileSystemModel *model,
                                                             GtkTreeIter        *iter);
 void                _gtk_file_system_model_set_show_hidden  (GtkFileSystemModel *model,
                                                             gboolean            show_hidden);
@@ -56,16 +57,28 @@ void                _gtk_file_system_model_set_show_folders (GtkFileSystemModel
 void                _gtk_file_system_model_set_show_files   (GtkFileSystemModel *model,
                                                             gboolean            show_files);
 
+typedef gboolean (*GtkFileSystemModelFilter) (GtkFileSystemModel *model,
+                                             GFile              *file,
+                                             GFileInfo          *info,
+                                             gpointer            user_data);
 
-typedef void (*GtkFileSystemModelURIFunc) (GtkFileSystemModel *model,
-                                          GtkTreePath        *path,
-                                          GtkTreeIter        *iter,
-                                          gpointer            user_data);
-                                  
-gboolean _gtk_file_system_model_uri_do (GtkFileSystemModel       *model,
-                                       const gchar              *uri,
-                                       GtkFileSystemModelURIFunc func,
-                                       gpointer                  user_data);
+void     _gtk_file_system_model_set_filter (GtkFileSystemModel      *model,
+                                           GtkFileSystemModelFilter filter,
+                                           gpointer                 user_data);
+
+typedef void (*GtkFileSystemModelPathFunc) (GtkFileSystemModel *model,
+                                           GtkTreePath        *path,
+                                           GtkTreeIter        *iter,
+                                           gpointer            user_data);
+
+void     _gtk_file_system_model_path_do (GtkFileSystemModel        *model,
+                                        GFile                     *file,
+                                        GtkFileSystemModelPathFunc func,
+                                        gpointer                   user_data);
+
+void _gtk_file_system_model_add_editable    (GtkFileSystemModel *model,
+                                            GtkTreeIter        *iter);
+void _gtk_file_system_model_remove_editable (GtkFileSystemModel *model);
 
 G_END_DECLS