Merge lp:~ivaldi/midori/fix-1190061 into lp:midori

[André Stösel]

Fix segfault when deleteing tabs with history list

[Paweł Forysiuk (tuxator)]

It no longer crashes for me. Even with multiple deletions.

review: Approve

[Cris Dywan (kalikiana)]

I'd like clarification on the #if. What do we lose with GTK+2 here? And do we know why it crashed, is it a GTK+2 bug?

review: Needs Fixing

[André Stösel (ivaldi)]

Dunno if it's a GTK2 bug, but if you remove the selected item it segfaults. The easiest solution is to change the selection before removing the item.

[lp:~ivaldi/midori/fix-1190061]

6210. By André Stösel on 2013-06-13

add a note for clarification

[André Stösel (ivaldi)]

I added a note for clarification.

[Cris Dywan (kalikiana)]

Thanks a lot!

review: Approve

=== modified file 'extensions/history-list.vala'
--- extensions/history-list.vala	2013-06-07 09:46:39 +0000
+++ extensions/history-list.vala	2013-06-13 20:40:35 +0000
@@ -50,6 +50,8 @@
             Gtk.TreeViewColumn? column;
 
             this.treeview.get_cursor (out path, out column);
+            if (path == null)
+                return;
 
             unowned int[] indices = path.get_indices ();
             int new_index = indices[0] + step;
@@ -171,13 +173,16 @@
             Gtk.TreeViewColumn? column;
 
             this.treeview.get_cursor (out path, out column);
+            if (path == null)
+                return;
 
             var model = this.treeview.get_model () as Gtk.ListStore;
 
             Gtk.TreeIter iter;
             unowned Midori.View? view = null;
 
-            model.get_iter (out iter, path);
+            if (!model.get_iter (out iter, path))
+                return;
             model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view);
             this.browser.set ("tab", view);
         }
@@ -212,6 +217,12 @@
 
                 model.get_iter (out iter, path);
                 model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view);
+#if !HAVE_GTK3
+                /* removing the selected cursor causes a segfault when using GTK2 */
+                if (path.prev () == false)
+                    path.next ();
+                this.treeview.set_cursor (path, column, false);
+#endif
 
                 /*
                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked