filechooserbutton: New test for opening the Other item in the combo box and then...

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

diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h
index ec8266f4665a74d7afe920ce4c70a48b5c86477e..03782d6f7f5cfaa13b44012366c6034c4f48960e 100644 (file)
--- a/gtk/gtkfilesystem.h
+++ b/gtk/gtkfilesystem.h
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GTK_FILE_SYSTEM_H__
@@ -38,17 +36,6 @@ typedef struct GtkFileSystemPrivate      GtkFileSystemPrivate;
 typedef struct GtkFileSystemClass     GtkFileSystemClass;
 
 
-#define GTK_TYPE_FOLDER         (_gtk_folder_get_type ())
-#define GTK_FOLDER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_FOLDER, GtkFolder))
-#define GTK_FOLDER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST    ((c), GTK_TYPE_FOLDER, GtkFolderClass))
-#define GTK_IS_FOLDER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_FOLDER))
-#define GTK_IS_FOLDER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_FOLDER))
-#define GTK_FOLDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_FOLDER, GtkFolderClass))
-
-typedef struct GtkFolder          GtkFolder;
-typedef struct GtkFolderPrivate      GtkFolderPrivate;
-typedef struct GtkFolderClass     GtkFolderClass;
-
 typedef struct GtkFileSystemVolume GtkFileSystemVolume; /* opaque struct */
 typedef struct GtkFileSystemBookmark GtkFileSystemBookmark; /* opaque struct */
 
@@ -69,32 +56,6 @@ struct GtkFileSystemClass
 };
 
 
-struct GtkFolder
-{
-  GObject parent_object;
-
-  GtkFolderPrivate *priv;
-};
-
-struct GtkFolderClass
-{
-  GObjectClass parent_class;
-
-  void (*files_added)      (GtkFolder *folder,
-                           GList     *paths);
-  void (*files_removed)    (GtkFolder *folder,
-                           GList     *paths);
-  void (*files_changed)    (GtkFolder *folder,
-                           GList     *paths);
-  void (*finished_loading) (GtkFolder *folder);
-  void (*deleted)          (GtkFolder *folder);
-};
-
-
-typedef void (* GtkFileSystemGetFolderCallback)    (GCancellable        *cancellable,
-                                                   GtkFolder           *folder,
-                                                   const GError        *error,
-                                                   gpointer             data);
 typedef void (* GtkFileSystemGetInfoCallback)      (GCancellable        *cancellable,
                                                    GFileInfo           *file_info,
                                                    const GError        *error,
@@ -112,18 +73,6 @@ GtkFileSystem * _gtk_file_system_new          (void);
 GSList *        _gtk_file_system_list_volumes   (GtkFileSystem *file_system);
 GSList *        _gtk_file_system_list_bookmarks (GtkFileSystem *file_system);
 
-gboolean        _gtk_file_system_parse          (GtkFileSystem     *file_system,
-                                                GFile             *base_file,
-                                                const gchar       *str,
-                                                GFile            **folder,
-                                                gchar            **file_part,
-                                                GError           **error);
-
-GCancellable *  _gtk_file_system_get_folder             (GtkFileSystem                     *file_system,
-                                                        GFile                             *file,
-                                                        const gchar                       *attributes,
-                                                        GtkFileSystemGetFolderCallback     callback,
-                                                        gpointer                           data);
 GCancellable *  _gtk_file_system_get_info               (GtkFileSystem                     *file_system,
                                                         GFile                             *file,
                                                         const gchar                       *attributes,
@@ -157,14 +106,6 @@ void            _gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
 GtkFileSystemVolume * _gtk_file_system_get_volume_for_file (GtkFileSystem       *file_system,
                                                            GFile               *file);
 
-/* GtkFolder functions */
-GSList *     _gtk_folder_list_children (GtkFolder  *folder);
-GFileInfo *  _gtk_folder_get_info      (GtkFolder  *folder,
-                                       GFile      *file);
-
-gboolean     _gtk_folder_is_finished_loading (GtkFolder *folder);
-
-
 /* GtkFileSystemVolume methods */
 gchar *               _gtk_file_system_volume_get_display_name (GtkFileSystemVolume *volume);
 gboolean              _gtk_file_system_volume_is_mounted       (GtkFileSystemVolume *volume);
@@ -187,6 +128,9 @@ GdkPixbuf *     _gtk_file_info_render_icon (GFileInfo *info,
 
 gboolean       _gtk_file_info_consider_as_directory (GFileInfo *info);
 
+/* GFile helper functions */
+gboolean       _gtk_file_has_native_path (GFile *file);
+
 G_END_DECLS
 
 #endif /* __GTK_FILE_SYSTEM_H__ */