Open source in the default editor and remove the unused copy api. Add a

2003-10-28  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/ephy-embed-persist.h:
        * embed/ephy-embed.c:
        * embed/ephy-embed.h:
        * embed/ephy-favicon-cache.c: (ephy_favicon_cache_download):
        * embed/mozilla/EphyBrowser.cpp:
        * embed/mozilla/EphyBrowser.h:
        * embed/mozilla/EphyHeaderSniffer.cpp:
        * embed/mozilla/EphyHeaderSniffer.h:
        * embed/mozilla/MozDownload.cpp:
        * embed/mozilla/MozDownload.h:
        * embed/mozilla/mozilla-embed-persist.cpp:
        * embed/mozilla/mozilla-embed.cpp:
        * src/ephy-shell.c: (delete_files), (ephy_shell_finalize),
        (ephy_shell_new_tab), (ephy_shell_delete_on_exit):
        * src/ephy-shell.h:
        * src/window-commands.c: (get_editor_application),
        (editor_open_uri), (save_source_completed_cb),
        (editor_can_open_uri), (save_temp_source),
        (window_cmd_view_page_source):

        Open source in the default editor and
        remove the unused copy api.
        Add a missing include while at it.

1 files changed, 13 insertions, 5 deletions

diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index f08d8648e..052aacb76 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -169,7 +169,9 @@ impl_save (EphyEmbedPersist *persist)
 		      "embed", &embed,
 		      "max_size", &max_size,
 		      NULL);
-	
+
+	g_return_val_if_fail (!(flags & EMBED_PERSIST_COPY_PAGE)
+			      || embed != NULL, G_FAILED);	
 	g_return_val_if_fail (filename != NULL, G_FAILED);
 
 	EphyBrowser *browser = NULL;
@@ -244,6 +246,14 @@ impl_save (EphyEmbedPersist *persist)
         	if (NS_FAILED(rv) || !DOMDocument) return G_FAILED;
 	}
 
+
+	/* Get the current page descriptor */
+	nsCOMPtr<nsISupports> pageDescriptor;
+	if (flags & EMBED_PERSIST_COPY_PAGE)
+	{
+	        rv = browser->GetPageDescriptor(getter_AddRefs(pageDescriptor));
+	}
+
 	if (filename == NULL)
 	{
 		/* Create an header sniffer and do the save */
@@ -253,8 +263,7 @@ impl_save (EphyEmbedPersist *persist)
 
 		EphyHeaderSniffer* sniffer = new EphyHeaderSniffer
 			(webPersist, MOZILLA_EMBED_PERSIST (persist),
-			 tmpFile, inURI, DOMDocument, postData,
-			 flags & EMBED_PERSIST_BYPASSCACHE);
+			 tmpFile, inURI, DOMDocument, postData);
 		if (!sniffer) return G_FAILED;
  
 		webPersist->SetProgressListener(sniffer);
@@ -271,8 +280,7 @@ impl_save (EphyEmbedPersist *persist)
 
 		rv =  InitiateMozillaDownload (DOMDocument, inURI, destFile,
 					       nsnull, inURI, MOZILLA_EMBED_PERSIST (persist),
-					       flags & EMBED_PERSIST_BYPASSCACHE,
-					       postData);
+					       postData, pageDescriptor);
 		if (NS_FAILED (rv)) return G_FAILED;
 	}