Added methods for ::get_supports_bookmarks(), ::set_bookmarks(),

2003-10-07  Federico Mena Quintero  <federico@ximian.com>

	* gtkfilesystem.h (struct _GtkFileSystemIface): Added methods for
	::get_supports_bookmarks(), ::set_bookmarks(), ::list_bookmarks().
	Added a ::bookmarks_changed() signal.

	* gtkfilesystem.c (gtk_file_system_get_supports_bookmarks): New function.
	(gtk_file_system_set_bookmarks): New function.
	(gtk_file_system_list_bookmarks): New function.
	(gtk_file_system_base_init): Create the "bookmarks-changed" signal.
	(gtk_file_paths_copy): New function.

	* gtkfilesystemunix.c (gtk_file_system_unix_get_supports_bookmarks): Implement.
	(gtk_file_system_unix_set_bookmarks): Implement.
	(gtk_file_system_unix_get_bookmarks): Implement.

	* gtkfilesystemgnomevfs.c (struct _GtkFileSystemGnomeVFS): Added
	fields for the bookmarks and the GConfClient.
	(gtk_file_system_gnome_vfs_set_bookmarks): Implement.
	(gtk_file_system_gnome_vfs_list_bookmarks): Implement.

	* gtkfilechooserprivate.h (struct _GtkFileChooserIface): Added
	methods for ::set_shortcut_folders(), ::list_shortcut_folders().

	* gtkfilechooser.c (gtk_file_chooser_set_shortcut_folders): New
	function.
	(gtk_file_chooser_list_shortcut_folders): New function.

	* gtkfilechooserimpldefault.c (create_shortcuts_model): Unref the
	old shortcuts model if it exists.  Create the nodes for the
	app-specific shortcut folders.
	(struct _GtkFileChooserImplDefault): Added a field for the
	shortcut_folders.
	(gtk_file_chooser_impl_default_set_shortcut_folders): Implement.
	(select_shortcuts_folder): New helper function.
	(gtk_file_chooser_impl_default_set_current_folder): Use
	select_shortcuts_folder().
	(shortcuts_append_path): Get the file info here, instead of the
	caller.
	(shortcuts_append_home): Use shortcuts_append_path().
	(shortcuts_append_file_system_roots): Likewise.
	(create_shortcuts_model): Add the app-specific shortcut folders
	and the bookmarks.
	(gtk_file_chooser_impl_default_list_shortcut_folders): Implement.
	(create_shortcuts_tree): Added a button to let the user add the
	current folder to the bookmarks.
	(gtk_file_chooser_impl_default_set_property): Connect to
	"bookmarks-changed" on the file system.
	(shortcuts_append_bookmarks): New function.

	* configure.ac: Depend on GConf.

1 files changed, 23 insertions, 21 deletions

diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index aeb79ee89d..9f0361896a 100644
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -36,33 +36,35 @@ struct _GtkFileChooserIface
 
   /* Methods
    */
-  void           (*set_current_folder) (GtkFileChooser    *chooser,
-		 		        const GtkFilePath *path);
-  GtkFilePath *  (*get_current_folder) (GtkFileChooser    *chooser);
-  void           (*set_current_name)   (GtkFileChooser    *chooser,
-					const gchar       *name);
-  void           (*select_path)        (GtkFileChooser    *chooser,
-		 		        const GtkFilePath *path);
-  void           (*unselect_path)      (GtkFileChooser    *chooser,
-		 		        const GtkFilePath *path);
-  void           (*select_all)         (GtkFileChooser    *chooser);
-  void           (*unselect_all)       (GtkFileChooser    *chooser);
-  GSList *       (*get_paths)          (GtkFileChooser    *chooser);
-  GtkFilePath *  (*get_preview_path)   (GtkFileChooser    *chooser);
-  GtkFileSystem *(*get_file_system)    (GtkFileChooser    *chooser);
-  void           (*add_filter)         (GtkFileChooser    *chooser,
-					GtkFileFilter     *filter);
-  void           (*remove_filter)      (GtkFileChooser    *chooser,
-					GtkFileFilter     *filter);
-  GSList *       (*list_filters)       (GtkFileChooser    *chooser);
-
+  void           (*set_current_folder) 	   (GtkFileChooser    *chooser,
+		 		       	    const GtkFilePath *path);
+  GtkFilePath *  (*get_current_folder) 	   (GtkFileChooser    *chooser);
+  void           (*set_current_name)   	   (GtkFileChooser    *chooser,
+					    const gchar       *name);
+  void           (*select_path)        	   (GtkFileChooser    *chooser,
+		 		       	    const GtkFilePath *path);
+  void           (*unselect_path)      	   (GtkFileChooser    *chooser,
+		 		       	    const GtkFilePath *path);
+  void           (*select_all)         	   (GtkFileChooser    *chooser);
+  void           (*unselect_all)       	   (GtkFileChooser    *chooser);
+  GSList *       (*get_paths)          	   (GtkFileChooser    *chooser);
+  GtkFilePath *  (*get_preview_path)   	   (GtkFileChooser    *chooser);
+  GtkFileSystem *(*get_file_system)    	   (GtkFileChooser    *chooser);
+  void           (*add_filter)         	   (GtkFileChooser    *chooser,
+					    GtkFileFilter     *filter);
+  void           (*remove_filter)      	   (GtkFileChooser    *chooser,
+					    GtkFileFilter     *filter);
+  GSList *       (*list_filters)       	   (GtkFileChooser    *chooser);
+  void           (*set_shortcut_folders)   (GtkFileChooser    *chooser,
+					    GSList            *bookmarks);
+  GSList *       (*list_shortcut_folders)  (GtkFileChooser    *chooser);
   
   /* Signals
    */
   void (*current_folder_changed) (GtkFileChooser *chooser);
   void (*selection_changed)      (GtkFileChooser *chooser);
   void (*update_preview)         (GtkFileChooser *chooser);
-  void (*file_activated)         (GtkFileChooser *chooser); 
+  void (*file_activated)         (GtkFileChooser *chooser);
 };
 
 GtkFileSystem *_gtk_file_chooser_get_file_system         (GtkFileChooser    *chooser);