Merge lp:~meese/midori/fix-bug1287809 into lp:midori

[meese]

Restore tab history from the trash

fixes 1287809 by saving history in item that is put in the trash and restored to view on undo

[Robert Roth (evfool)]

Looks fine overall, one minor comment, see it inline.

[Cris Dywan (kalikiana)]

39 + KatzeArray* history;

Directly exposing and using a member is problematic. I would in fact prefer for now use g_object_get_data (G_OBJECT (item), "tab-history") to avoid adding API.
Later the code would be better to migrate towards Midori.HistoryWebsite which is cleaner than tucking more features onto KatzeItem, also using it for the trash itself and for session management (see related code for the session restoring https://code.launchpad.net/~midori/midori/tabHistory/+merge/211230).
(I realize these sort of plans should be documented in a wiki page somewhere… sorry about that)

tl;dr; I'd appreciate if you'd change it to g_object_get_data (G_OBJECT (item), "tab-history") for now without adding API.

review: Needs Fixing

[lp:~meese/midori/fix-bug1287809]

6720. By meese on 2014-08-13

change to attach history with g_objecct_get_data ,remove katze changes

[meese (meese)]

fixed

Unmerged revisions

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2014-05-20 02:15:05 +0000
+++ katze/katze-item.c	2014-08-13 00:37:48 +0000
@@ -8,7 +8,7 @@
 
  See the file COPYING for the full license text.
 */
-
+ 
 #include "katze-item.h"
 #include "katze-utils.h"
 #include "midori/midori-core.h"
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-07-30 17:47:30 +0000
+++ midori/midori-browser.c	2014-08-13 00:37:48 +0000
@@ -1426,6 +1426,34 @@
 }
 
 static void
+midori_browser_view_copy_to_item_history (GtkWidget* view,
+                                          KatzeItem* item)
+{
+#ifndef HAVE_WEBKIT2
+    WebKitWebView* copy_from;
+    WebKitWebBackForwardList* list_from;
+    guint length_from;
+    gint i;
+    GPtrArray* history;
+
+    copy_from = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
+    list_from = webkit_web_view_get_back_forward_list (copy_from);
+    length_from = webkit_web_back_forward_list_get_back_length (list_from);
+    history = g_ptr_array_new ();
+
+    for (i = -length_from; i <=  -1 ; i++)
+    {
+        WebKitWebHistoryItem* hist_item = webkit_web_back_forward_list_get_nth_item (list_from, i);
+        if (hist_item == NULL)
+            break;
+        g_object_ref ((gpointer) hist_item);
+        g_ptr_array_add (history, (gpointer) hist_item);
+    }
+    g_object_set_data (G_OBJECT (item), "tab-history", (gpointer) history);
+#endif
+}
+
+static void
 midori_view_destroy_cb (GtkWidget*     view,
                         MidoriBrowser* browser)
 {
@@ -1436,7 +1464,10 @@
          && !midori_tab_is_blank (MIDORI_TAB (view)))
         {
             if (browser->trash)
+            {
+                midori_browser_view_copy_to_item_history (view,item);
                 katze_array_add_item (browser->trash, item);
+            }
             midori_browser_update_history (item, "website", "leave");
         }
         midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
@@ -1508,6 +1539,39 @@
 #endif
 }
 
+
+static void
+midori_browser_view_copy_from_item_history (GtkWidget* view,
+                                            KatzeItem* item)
+{
+#ifndef HAVE_WEBKIT2
+    WebKitWebView* copy_to;
+    WebKitWebBackForwardList* list_to;
+    gint i;
+    GPtrArray* list_from;
+
+    copy_to = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
+    list_to = webkit_web_view_get_back_forward_list (copy_to);
+
+    if (item == NULL)
+        return;
+    list_from = g_object_get_data (G_OBJECT (item), "tab-history");
+    if (list_from == NULL)
+        return;
+
+    for (i = 0; i < list_from->len; i++)
+    {
+        WebKitWebHistoryItem* hist_item = (WebKitWebHistoryItem*) g_ptr_array_index (list_from, i);
+        if (hist_item == NULL)
+            break;
+        webkit_web_back_forward_list_add_item (list_to, hist_item);
+    }
+    g_ptr_array_unref (list_from);
+#endif
+}
+
+
+
 static gboolean
 midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser)
 {
@@ -1947,7 +2011,7 @@
     g_free (old);
 }
 
-static void 
+static void
 _update_reload_tooltip (GtkWidget*   widget,
                         GdkEventKey* event,
                         gboolean released)
@@ -1960,12 +2024,12 @@
     GdkModifierType mask;
     gdk_window_get_pointer (gtk_widget_get_window (widget), NULL, NULL, &mask);
     const gchar *target;
-    
+
     if ( mask & GDK_SHIFT_MASK)
     {
         target = _("Reload page without caching");
     }
-    else 
+    else
     {
         target = _("Reload the current page");
     }
@@ -3126,10 +3190,11 @@
                             KatzeItem*     item)
 {
     GtkWidget* view;
-
     g_object_ref (item);
     katze_array_remove_item (browser->trash, item);
     view = midori_browser_add_item (browser, item);
+    midori_browser_view_copy_from_item_history (view,item);
+
     g_object_unref (item);
     return view;
 }
@@ -5543,6 +5608,7 @@
 static void
 midori_browser_destroy_cb (MidoriBrowser* browser)
 {
+
     g_object_set_data (G_OBJECT (browser), "midori-browser-destroyed", (void*)1);
 
     if (G_UNLIKELY (browser->panel_timeout))
@@ -6366,7 +6432,7 @@
         {
             gtk_action_activate (_action_by_name (browser, "TabDuplicate"));
         }
-        
+
         GtkWidget* parent = gtk_widget_get_parent (toolitem);
         GtkAction* action = gtk_activatable_get_related_action (
             GTK_ACTIVATABLE (parent));
@@ -7565,14 +7631,14 @@
         browser = gtk_window_get_transient_for (GTK_WINDOW (browser));
         if (!MIDORI_IS_BROWSER (browser))
         {
-            /* For some reason, when called on the widget of the 
+            /* For some reason, when called on the widget of the
              * application menubar we get here.
              */
 
             GList* top_levels = gtk_window_list_toplevels ();
             GList *iter;
 
-            for (iter = top_levels; iter; iter = g_list_next (iter)) 
+            for (iter = top_levels; iter; iter = g_list_next (iter))
             {
                 browser = iter->data;
 
@@ -7582,7 +7648,7 @@
                     return MIDORI_BROWSER (browser);
                 }
             }
-            
+
             g_list_free (top_levels);
             return NULL;
         }