[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5122f38bf8df201b1e4f7ef0683cb905ec335431
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 19:31:32 2009 +0000

    Reviewed by Xan Lopez.
    
    Provides a new API to copy WebKitWebHistoryItem objects.
    
    * webkit/webkitwebhistoryitem.cpp:
    (webkit_web_history_item_copy):
    * webkit/webkitwebhistoryitem.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 094ab65..fbd4946 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -14,6 +14,16 @@
 
         Reviewed by Xan Lopez.
 
+        Provides a new API to copy WebKitWebHistoryItem objects.
+
+        * webkit/webkitwebhistoryitem.cpp:
+        (webkit_web_history_item_copy):
+        * webkit/webkitwebhistoryitem.h:
+
+2009-12-20  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
         Make sure we get the URI that is being loaded when updating
         WebKitWebFrame's knowledge of it. This was causing problems now
         that page cache is enabled.
diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
index aab8b51..f2811ea 100644
--- a/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
@@ -432,6 +432,33 @@ gdouble webkit_web_history_item_get_last_visited_time(WebKitWebHistoryItem* webH
     return item->lastVisitedTime();
 }
 
+/**
+ * webkit_web_history_item_copy :
+ * @web_history_item: a #WebKitWebHistoryItem
+ *
+ * Makes a copy of the item for use with other WebView objects.
+ *
+ * Since: 1.1.18
+ *
+ * Return value: the new #WebKitWebHistoryItem.
+ */
+WebKitWebHistoryItem* webkit_web_history_item_copy(WebKitWebHistoryItem* self)
+{
+    WebKitWebHistoryItemPrivate* selfPrivate = self->priv;
+
+    WebKitWebHistoryItem* item = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, 0));
+    WebKitWebHistoryItemPrivate* priv = item->priv;
+
+    priv->title = selfPrivate->title;
+    priv->alternateTitle = selfPrivate->alternateTitle;
+    priv->uri = selfPrivate->uri;
+    priv->originalUri = selfPrivate->originalUri;
+
+    priv->historyItem = selfPrivate->historyItem->copy().releaseRef();
+
+    return item;
+}
+
 /* private methods */
 
 G_CONST_RETURN gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem* webHistoryItem)
diff --git a/WebKit/gtk/webkit/webkitwebhistoryitem.h b/WebKit/gtk/webkit/webkitwebhistoryitem.h
index cafeb36..1820736 100644
--- a/WebKit/gtk/webkit/webkitwebhistoryitem.h
+++ b/WebKit/gtk/webkit/webkitwebhistoryitem.h
@@ -82,6 +82,9 @@ webkit_web_history_item_get_original_uri      (WebKitWebHistoryItem *web_history
 WEBKIT_API gdouble
 webkit_web_history_item_get_last_visited_time (WebKitWebHistoryItem *web_history_item);
 
+WEBKIT_API WebKitWebHistoryItem*
+webkit_web_history_item_copy                  (WebKitWebHistoryItem *web_history_item);
+
 G_END_DECLS
 
 #endif /* webkitwebhistoryitem_h */

-- 
WebKit Debian packaging