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

[meese]

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.

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

6719. By meese on 2014-07-25

fix refrencing object after unref called

6720. By meese on 2014-08-13

change to attach history with g_objecct_get_data ,remove katze changes

Unmerged revisions

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2014-05-20 02:15:05 +0000
+++ katze/katze-item.c	2014-07-25 01:38:09 +0000
@@ -8,8 +8,8 @@
 
  See the file COPYING for the full license text.
 */
-
 #include "katze-item.h"
+#include "katze-array.h"
 #include "katze-utils.h"
 #include "midori/midori-core.h"
 

=== modified file 'katze/katze-item.h'
--- katze/katze-item.h	2012-12-16 18:40:00 +0000
+++ katze/katze-item.h	2014-07-25 01:38:09 +0000
@@ -11,7 +11,6 @@
 
 #ifndef __KATZE_ITEM_H__
 #define __KATZE_ITEM_H__
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
@@ -34,7 +33,7 @@
 
 typedef struct _KatzeItem                KatzeItem;
 typedef struct _KatzeItemClass           KatzeItemClass;
-
+typedef struct _KatzeArray          KatzeArray;
 struct _KatzeItem
 {
     GObject parent_instance;
@@ -47,6 +46,7 @@
     GHashTable* metadata;
 
     KatzeItem* parent;
+    KatzeArray* history;
 };
 
 struct _KatzeItemClass

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-07-24 07:20:50 +0000
+++ midori/midori-browser.c	2014-07-25 01:38:09 +0000
@@ -1397,6 +1397,30 @@
 }
 
 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;
+
+    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);
+    item->history = katze_array_new(G_TYPE_OBJECT);
+    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;
+        katze_array_add_item (item->history,hist_item);
+    }
+#endif
+}
+
+static void
 midori_view_destroy_cb (GtkWidget*     view,
                         MidoriBrowser* browser)
 {
@@ -1407,7 +1431,11 @@
          && !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));
@@ -1479,6 +1507,34 @@
 #endif
 }
 
+
+static void
+midori_browser_view_copy_from_item_history (GtkWidget* view,
+                                            KatzeArray* list_from)
+{
+#ifndef HAVE_WEBKIT2
+    WebKitWebView* copy_to;
+    WebKitWebBackForwardList* list_to;
+    guint length_from;
+    gint i;
+
+    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(list_from == NULL)
+        return;
+    length_from = katze_array_get_length (list_from);
+    for (i = 0; i < length_from ; i++)
+    {
+        WebKitWebHistoryItem* hist_item = katze_array_get_nth_item (list_from, i);
+        if (hist_item == NULL)
+            break;
+        webkit_web_back_forward_list_add_item (list_to,hist_item);
+    }
+#endif
+}
+
+
+
 static gboolean
 midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser)
 {
@@ -1913,7 +1969,7 @@
     g_free (old);
 }
 
-static void 
+static void
 _update_reload_tooltip (GtkWidget*   widget,
                         GdkEventKey* event,
                         gboolean released)
@@ -1926,12 +1982,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");
     }
@@ -3096,6 +3152,7 @@
     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->history);
     g_object_unref (item);
     return view;
 }
@@ -5509,6 +5566,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))
@@ -6332,7 +6390,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));
@@ -7531,14 +7589,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;
 
@@ -7548,7 +7606,7 @@
                     return MIDORI_BROWSER (browser);
                 }
             }
-            
+
             g_list_free (top_levels);
             return NULL;
         }