diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2003-10-18 04:29:40 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2003-10-18 04:29:40 +0000 |
| commit | b49a5ec5b4a4149431eac0147fe5acc810b1128b (patch) | |
| tree | 4c68cdf58148f26a223cd58180892b38b834f1e4 /gtk/gtkfilesystem.h | |
| parent | a0628bab9aab1667709d1d6d43ad13ce5695511f (diff) | |
| download | gtk+-b49a5ec5b4a4149431eac0147fe5acc810b1128b.tar.gz | |
Removed. (gtk_file_system_gnome_vfs_set_bookmarks): Removed.
2003-10-17 Federico Mena Quintero <federico@ximian.com>
* gtkfilesystemgnomevfs.c
(gtk_file_system_gnome_vfs_get_supports_bookmarks): Removed.
(gtk_file_system_gnome_vfs_set_bookmarks): Removed.
(gtk_file_system_gnome_vfs_add_bookmark): Implement.
(gtk_file_system_gnome_vfs_remove_bookmark): Implement.
* gtkfilechooserprivate.h (struct _GtkFileChooserIface): Replaced
the ::set_shortcut_folders() method with :;add_shortcut_folder()
and ::remove_shortcut_folder().
* gtkfilechooserutils.c (delegate_add_shortcut_folder): New function.
(delegate_remove_shortcut_folder): New function.
(delegate_list_shortcut_folders): New function.
* gtkfilechooserimpldefault.c (create_shortcuts_model): Insert the
Desktop directory as well.
(shortcuts_insert_path): Renamed from shortcuts_append_path; now
takes a position index instead of a parent node iter. Also takes
a GError argument.
(struct _GtkFileChooserImplDefault): Removed the shortcuts_folder
list. It is all kept in the model now.
(shortcuts_append_home): Save whether adding a shortcut for the
home directory was successful.
(shortcuts_append_desktop): Likewise for the desktop.
(shortcuts_append_file_system_roots): Count and save the number of
roots added.
(shortcuts_append_shortcut_folders): Removed.
(gtk_file_chooser_impl_default_add_shortcut_folder): Implement.
(shortcuts_append_bookmarks): Now that we don't have a bookmarks
parent node, don't expand the tree.
(add_bookmark_button_clicked_cb): Use gtk_file_system_add_bookmark().
(remove_bookmark_button_clicked_cb): Use gtk_file_system_remove_bookmark().
(gtk_file_chooser_impl_default_list_shortcut_folders): Get the
folders from the shortcuts model; we no longer keep a separate list.
* gtkfilesystem.h (struct _GtkFileSystemIface): Oops, there
shouldn't be shortcuts-related virtual methods here.
* gtkfilechooser.c (file_paths_to_strings): New helper function.
(gtk_file_chooser_get_filenames): Use file_paths_to_strings().
(gtk_file_chooser_get_uris): Likewise.
(gtk_file_chooser_set_shortcut_folders): Removed.
(gtk_file_chooser_list_shortcut_folders): Return a list of
strings, not of GtkFilePath*.
(gtk_file_chooser_list_shortcut_folder_uris): New function.
(gtk_file_chooser_add_shortcut_folder): New function.
(gtk_file_chooser_remove_shortcut_folder): New function.
(gtk_file_chooser_add_shortcut_folder_uri): New function.
(gtk_file_chooser_remove_shortcut_folder_uri): New function.
(_gtk_file_chooser_add_shortcut_folder): New function.
(_gtk_file_chooser_remove_shortcut_folder): New function.
* gtkfilechooser.h: New enum.
* gtkfilechooser.c (gtk_file_chooser_error_quark): New function.
* gtkfilesystem.c (gtk_file_system_get_supports_bookmarks): Removed.
(gtk_file_system_set_bookmarks): Removed.
(gtk_file_system_add_bookmark): New function.
(gtk_file_system_remove_bookmark): New function.
* gtkfilesystemunix.c
(gtk_file_system_unix_get_supports_bookmarks): Removed.
(gtk_file_system_unix_set_bookmarks): Removed.
(gtk_file_system_unix_add_bookmark): Just a stub for now.
(gtk_file_system_unix_remove_bookmark): Likewise.
* testfilechooser.c (main): Add a shortcut for testing purposes.
Diffstat (limited to 'gtk/gtkfilesystem.h')
| -rw-r--r-- | gtk/gtkfilesystem.h | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h index 8eefad487b..18ba61ca5d 100644 --- a/gtk/gtkfilesystem.h +++ b/gtk/gtkfilesystem.h @@ -144,13 +144,6 @@ struct _GtkFileSystemIface const GtkFilePath *path, GError **error); - gboolean (*supports_shortcuts) (GtkFileSystem *file_system); - GSList * (*list_shortcuts) (GtkFileSystem *file_system, - GError **error); - gboolean (*set_shortcuts) (GtkFileSystem *file_system, - GSList *shortcuts, - GError **error); - /* Path Manipulation */ gboolean (*get_parent) (GtkFileSystem *file_system, @@ -178,10 +171,12 @@ struct _GtkFileSystemIface /* Bookmarks */ - gboolean (*get_supports_bookmarks) (GtkFileSystem *file_system); - void (*set_bookmarks) (GtkFileSystem *file_system, - GSList *bookmarks, - GError **error); + gboolean (*add_bookmark) (GtkFileSystem *file_system, + const GtkFilePath *path, + GError **error); + gboolean (*remove_bookmark) (GtkFileSystem *file_system, + const GtkFilePath *path, + GError **error); GSList * (*list_bookmarks) (GtkFileSystem *file_system); /* Signals @@ -198,13 +193,6 @@ GtkFileInfo * gtk_file_system_get_root_info (GtkFileSystem *file_system GtkFileInfoType types, GError **error); -gboolean gtk_file_system_supports_shortcuts (GtkFileSystem *file_system); -GSList * gtk_file_system_list_shortcuts (GtkFileSystem *file_system, - GError **error); -gboolean gtk_file_system_set_shortcuts (GtkFileSystem *file_system, - GSList *shortcuts, - GError **error); - gboolean gtk_file_system_get_parent (GtkFileSystem *file_system, const GtkFilePath *path, GtkFilePath **parent, @@ -236,12 +224,13 @@ GtkFilePath *gtk_file_system_uri_to_path (GtkFileSystem *file_system, GtkFilePath *gtk_file_system_filename_to_path (GtkFileSystem *file_system, const gchar *filename); -gboolean gtk_file_system_get_supports_bookmarks (GtkFileSystem *file_system); - -void gtk_file_system_set_bookmarks (GtkFileSystem *file_system, - GSList *bookmarks, - GError **error); -GSList *gtk_file_system_list_bookmarks (GtkFileSystem *file_system); +gboolean gtk_file_system_add_bookmark (GtkFileSystem *file_system, + const GtkFilePath *path, + GError **error); +gboolean gtk_file_system_remove_bookmark (GtkFileSystem *file_system, + const GtkFilePath *path, + GError **error); +GSList *gtk_file_system_list_bookmarks (GtkFileSystem *file_system); /* |