Port to new gtk+ file chooser.

2003-10-26  Christian Persch  <chpe@cvs.gnome.org>

	Port to new gtk+ file chooser.

	* data/epiphany.schemas.in:
	* lib/ephy-prefs.h:

	Add key for remembering upload path.

	* embed	/Makefile.am:
	* embed/downloader-view.c:
	* embed/ephy-embed-persist.c: (ephy_embed_persist_get_type),
	(ephy_embed_persist_set_dest), (ephy_embed_persist_set_embed),
	(ephy_embed_persist_set_fc_title),
	(ephy_embed_persist_set_fc_parent), (ephy_embed_persist_set_flags),
	(ephy_embed_persist_set_max_size),
	(ephy_embed_persist_set_persist_key),
	(ephy_embed_persist_set_source), (ephy_embed_persist_get_dest),
	(ephy_embed_persist_get_embed), (ephy_embed_persist_get_fc_title),
	(ephy_embed_persist_get_fc_parent), (ephy_embed_persist_get_flags),
	(ephy_embed_persist_get_max_size),
	(ephy_embed_persist_get_persist_key),
	(ephy_embed_persist_get_source), (ephy_embed_persist_set_property),
	(ephy_embed_persist_get_property), (ephy_embed_persist_init),
	(ephy_embed_persist_finalize), (ephy_embed_persist_class_init),
	(ephy_embed_persist_cancel), (ephy_embed_persist_save),
	(ephy_embed_persist_new):
	* embed/ephy-embed-persist.h:
	* embed/ephy-embed-popup-control.c: (save_url),
	(save_property_url), (background_download_completed),
	(embed_popup_set_image_as_background_cmd),
	(embed_popup_copy_image_location_cmd):
        * src/popup-commands.c: (save_property_url),
	(background_download_completed),
	(popup_cmd_set_image_as_background):
	* src/window-commands.c: (open_response_cb),
	(window_cmd_file_open), (window_cmd_file_save_as):
	* src/window-commands.h:
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get_type),
	(ephy_favicon_cache_new), (icon_is_obsolete), (icons_added_cb),
	(remove_obsolete_icons), (ephy_favicon_cache_init),
	(favicon_download_completed_cb), (ephy_favicon_cache_download),
	(ephy_favicon_cache_get):
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* src/popup-commands.c: (save_property_url),
	(background_download_completed),
	(popup_cmd_set_image_as_background):
	* src/window-commands.c: (open_response_cb),
	(window_cmd_file_open), (window_cmd_file_save_as):
	* src/window-commands.h:

	Simplify EphyEmbedPersist implementation. Augment it with properties
	for showing a file chooser to select persist destination. Port all
	callers to new interfaces.

	* embed/ephy-embed-single.c: (ephy_embed_single_remove_passwords):
	* embed/ephy-embed-single.h:

	* embed/ephy-embed-utils.c:
	* embed/ephy-embed-utils.h:

	Obsolete and removed.

	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/ContentHandler.h:

	Misc cleanups.

	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/FilePicker.h:

	Port to new file chooser class.

	* embed/mozilla/Makefile.am:
	* lib/Makefile.am:
	* lib/ephy-file-chooser.c: (ephy_file_chooser_get_type),
	(current_folder_changed_cb), (ephy_file_chooser_init),
	(ephy_file_chooser_finalize), (ephy_file_chooser_set_persist_key),
	(ephy_file_chooser_set_property), (ephy_file_chooser_get_property),
	(ephy_file_chooser_class_init), (ephy_file_chooser_new):
	* lib/ephy-file-chooser.h:
	* src/bookmarks/ephy-bookmarks-editor.c:
	(import_from_file_response_cb), (import_dialog_response_cb):

	New file chooser wrapper class; ported file chooser callers to it.

1 files changed, 45 insertions, 56 deletions

diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index 1a48d2455..2f2db4f1b 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -1,5 +1,6 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -14,6 +15,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifndef EPHY_EMBED_PERSIST_H
@@ -24,6 +27,8 @@
 #include <glib-object.h>
 #include <glib.h>
 
+#include <gtk/gtkwindow.h>
+
 G_BEGIN_DECLS
 
 #define EPHY_TYPE_EMBED_PERSIST		(ephy_embed_persist_get_type ())
@@ -39,94 +44,78 @@ typedef struct EphyEmbedPersistPrivate EphyEmbedPersistPrivate;
 
 typedef enum
 {
-	EMBED_PERSIST_BYPASSCACHE = 1 << 0,
-	EMBED_PERSIST_MAINDOC = 1 << 1,
-	EMBED_PERSIST_NO_VIEW = 1 << 2,
-	EMBED_PERSIST_ASK_DESTINATION = 1 << 3
+	EMBED_PERSIST_BYPASSCACHE	= 1 << 0,
+	EMBED_PERSIST_MAINDOC		= 1 << 1,
+	EMBED_PERSIST_NO_VIEW		= 1 << 2,
+	EMBED_PERSIST_ASK_DESTINATION	= 1 << 3
 } EmbedPersistFlags;
 
-typedef struct
-{
-	char *command;
-	gboolean need_terminal;
-} PersistHandlerInfo;
-
 struct EphyEmbedPersist
 {
-        GObject parent;
-        EphyEmbedPersistPrivate *priv;
+	GObject parent;
+	EphyEmbedPersistPrivate *priv;
 };
 
 struct EphyEmbedPersistClass
 {
-        GObjectClass parent_class;
+	GObjectClass parent_class;
 
-	void (* completed) (EphyEmbedPersist *persist);
+	void (* completed)	(EphyEmbedPersist *persist);
 
 	/* Methods */
 
-	gresult (* set_source)   (EphyEmbedPersist *persist,
-				  const char *url);
+	gresult (* save)	(EphyEmbedPersist *persist);
 
-	gresult (* set_dest)     (EphyEmbedPersist *persist,
-				  const char *dir);
+	gresult (* cancel)	(EphyEmbedPersist *persist);
+};
 
-	gresult (* save)         (EphyEmbedPersist *persist);
+GType			 ephy_embed_persist_get_type	(void);
 
-	gresult (* cancel)       (EphyEmbedPersist *persist);
+EphyEmbedPersist	*ephy_embed_persist_new			(EphyEmbed *embed);
 
-	gresult (* set_max_size) (EphyEmbedPersist *persist,
-				  int max_size);
+gresult			 ephy_embed_persist_save		(EphyEmbedPersist *persist);
 
-	gresult (* set_embed)    (EphyEmbedPersist *persist,
-				  EphyEmbed *embed);
+gresult			 ephy_embed_persist_cancel		(EphyEmbedPersist *persist);
 
-	gresult (* set_flags)    (EphyEmbedPersist *persist,
-				  EmbedPersistFlags flags);
+void			 ephy_embed_persist_set_dest		(EphyEmbedPersist *persist,
+								 const char *value);
 
-	gresult (* set_handler)  (EphyEmbedPersist *persist,
-				  const char *command,
-				  gboolean need_terminal);
-};
+void			 ephy_embed_persist_set_embed		(EphyEmbedPersist *persist,
+								 EphyEmbed *value);
 
-GType               ephy_embed_persist_get_type    (void);
+void			 ephy_embed_persist_set_fc_title	(EphyEmbedPersist *persist,
+								 const char *value);
 
-EphyEmbedPersist   *ephy_embed_persist_new         (EphyEmbed *embed);
+void			 ephy_embed_persist_set_fc_parent	(EphyEmbedPersist *persist,
+								 GtkWindow *value);
 
-gresult             ephy_embed_persist_set_source  (EphyEmbedPersist *persist,
-						    const char *url);
+void			 ephy_embed_persist_set_flags		(EphyEmbedPersist *persist,
+								 EmbedPersistFlags value);
 
-gresult             ephy_embed_persist_get_source  (EphyEmbedPersist *persist,
-						    const char **url);
+void			 ephy_embed_persist_set_max_size	(EphyEmbedPersist *persist,
+								 int value);
 
-gresult		    ephy_embed_persist_set_dest    (EphyEmbedPersist *persist,
-						    const char *dir);
+void			 ephy_embed_persist_set_persist_key	(EphyEmbedPersist *persist,
+								 const char *value);
 
-gresult		    ephy_embed_persist_get_dest    (EphyEmbedPersist *persist,
-						    const char **dir);
+void			 ephy_embed_persist_set_source		(EphyEmbedPersist *persist,
+								 const char *value);
 
-gresult		    ephy_embed_persist_set_handler (EphyEmbedPersist *persist,
-						    const char *handler,
-						    gboolean need_terminal);
+const char 		*ephy_embed_persist_get_dest		(EphyEmbedPersist *persist);
 
-gresult		    ephy_embed_persist_set_max_size (EphyEmbedPersist *persist,
-						     int kb_size);
+EphyEmbed		*ephy_embed_persist_get_embed		(EphyEmbedPersist *persist);
 
-gresult             ephy_embed_persist_set_embed   (EphyEmbedPersist *persist,
-		                                    EphyEmbed *embed);
+const char 		*ephy_embed_persist_get_fc_title	(EphyEmbedPersist *persist);
 
-gresult             ephy_embed_persist_get_embed   (EphyEmbedPersist *persist,
-		                                    EphyEmbed **embed);
+GtkWindow		*ephy_embed_persist_get_fc_parent	(EphyEmbedPersist *persist);
 
-gresult		    ephy_embed_persist_set_flags   (EphyEmbedPersist *persist,
-						    EmbedPersistFlags flags);
+EmbedPersistFlags	 ephy_embed_persist_get_flags		(EphyEmbedPersist *persist);
 
-gresult		    ephy_embed_persist_get_flags   (EphyEmbedPersist *persist,
-						    EmbedPersistFlags *flags);
+int			 ephy_embed_persist_get_max_size	(EphyEmbedPersist *persist);
 
-gresult		    ephy_embed_persist_save        (EphyEmbedPersist *persist);
+const char 		*ephy_embed_persist_get_persist_key	(EphyEmbedPersist *persist);
 
-gresult		    ephy_embed_persist_cancel      (EphyEmbedPersist *persist);
+const char 		*ephy_embed_persist_get_source		(EphyEmbedPersist *persist);
 
 G_END_DECLS