3 files changed, 77 insertions, 0 deletions

diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 77b7e2c5c..1bc8fc440 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -50,6 +50,8 @@
 #include "nsIDocShellTreeNode.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIWebPageDescriptor.h"
+#include "nsISHistory.h"
+#include "nsISHistoryInternal.h"
 #include "nsISHEntry.h"
 #include "nsIHistoryEntry.h"
 #include "nsIDOMHTMLDocument.h"
@@ -790,6 +792,62 @@ nsresult EphyBrowser::GetSHistory (nsISHistory **aSHistory)
 	return NS_OK;
 }
 
+nsresult EphyBrowser::CopySHistory (EphyBrowser *dest, PRBool copy_back,
+	                            PRBool copy_forward, PRBool copy_current)
+{
+	nsresult rv;
+	
+	nsCOMPtr<nsISHistory> h_src;
+	GetSHistory (getter_AddRefs(h_src));
+	NS_ENSURE_TRUE (h_src, NS_ERROR_FAILURE);
+
+	PRInt32 count, index;
+	h_src->GetCount (&count);
+	h_src->GetIndex (&index);
+
+	nsCOMPtr<nsISHistory> h_dest;
+	dest->GetSHistory (getter_AddRefs (h_dest));
+	NS_ENSURE_TRUE (h_dest, NS_ERROR_FAILURE);
+
+	nsCOMPtr<nsISHistoryInternal> hi_dest = do_QueryInterface (h_dest);
+	NS_ENSURE_TRUE (hi_dest, NS_ERROR_FAILURE);
+
+	if (count)
+	{
+		nsCOMPtr<nsIHistoryEntry> he;
+		nsCOMPtr<nsISHEntry> she, dhe;
+
+		for (PRInt32 i = (copy_back ? 0 : index + 1); 
+		     i < (copy_forward ? count : index + 1);
+		     i++) 
+		{
+			rv = h_src->GetEntryAtIndex (i, PR_FALSE,
+						     getter_AddRefs (he));
+			NS_ENSURE_SUCCESS (rv, rv);
+
+			she = do_QueryInterface (he);
+			NS_ENSURE_TRUE (she, NS_ERROR_FAILURE);
+			
+			rv = she->Clone(getter_AddRefs (dhe));
+			NS_ENSURE_SUCCESS (rv, rv);
+
+			rv = hi_dest->AddEntry (dhe, PR_TRUE);
+			NS_ENSURE_SUCCESS (rv, rv);
+		}
+		
+		if (copy_current)
+		{
+			nsCOMPtr<nsIWebNavigation> wn_dest = do_QueryInterface (dest->mWebBrowser);
+			NS_ENSURE_TRUE (wn_dest, NS_ERROR_FAILURE);
+			
+			rv = wn_dest->GotoIndex(index);
+			if (!NS_SUCCEEDED(rv)) return NS_ERROR_FAILURE;
+		}
+	}
+
+	return NS_OK;
+}
+
 nsresult EphyBrowser::Destroy ()
 {
 	DetachListeners ();
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 2020cf4f1..c21aac103 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -177,6 +177,9 @@ public:
 	nsresult GetSecurityInfo (PRUint32 *aState, nsACString &aDescription);
 	nsresult ShowCertificate ();
 
+	nsresult CopySHistory (EphyBrowser *dest, PRBool copy_back,
+	                       PRBool copy_forward, PRBool copy_current);
+
 	nsresult Close ();
 
         EphyEmbedDocumentType GetDocumentType ();
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 5116f12e3..5a684a54e 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -42,6 +42,7 @@
 #include <nsMemory.h>
 #include <nsIURI.h>
 #include <nsIRequest.h>
+#include <nsIWebNavigation.h>
 #include <nsIWebProgressListener.h>
 #include <nsGfxCIID.h>
 
@@ -721,6 +722,20 @@ impl_shistory_go_nth (EphyEmbed *embed,
 }
 
 static void
+impl_shistory_copy (EphyEmbed *source,
+		    EphyEmbed *dest,
+		    gboolean copy_back,
+		    gboolean copy_forward,
+		    gboolean copy_current)
+{
+	MozillaEmbedPrivate *spriv = MOZILLA_EMBED(source)->priv;
+	MozillaEmbedPrivate *dpriv = MOZILLA_EMBED(dest)->priv;
+
+	spriv->browser->CopySHistory(dpriv->browser, copy_back,
+				     copy_forward, copy_current);
+}
+
+static void
 impl_get_security_level (EphyEmbed *embed,
                          EphyEmbedSecurityLevel *level,
                          char **description)
@@ -1169,6 +1184,7 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
 	iface->shistory_get_nth = impl_shistory_get_nth;
 	iface->shistory_get_pos = impl_shistory_get_pos;
 	iface->shistory_go_nth = impl_shistory_go_nth;
+	iface->shistory_copy = impl_shistory_copy;
 	iface->get_security_level = impl_get_security_level;
 	iface->show_page_certificate = impl_show_page_certificate;
 	iface->close = impl_close;