Merge lp:~r2d2.art2005/midori/midori into lp:~vcs-imports/midori/master

[Arturo Torres Sánchez]

This branch fixes bug 1082786

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-01-10 22:45:48 +0000
+++ midori/midori-browser.c	2013-01-26 16:08:19 +0000
@@ -4909,41 +4909,50 @@
 
 #ifdef HAVE_GRANITE
 static void
-midori_browser_notebook_tab_added_cb (GtkWidget*         notebook,
+midori_browser_notebook_tab_added_cb (GtkWidget* notebook,
                                       GraniteWidgetsTab* tab,
-                                      MidoriBrowser*     browser)
+                                      MidoriBrowser* browser)
 {
+    gint n = granite_widgets_dynamic_notebook_get_tab_position (notebook, tab);
+    midori_browser_set_current_page (browser, n);
     GtkWidget* view = midori_view_new_with_item (NULL, browser->settings);
     midori_view_set_tab (MIDORI_VIEW (view), tab);
     midori_browser_connect_tab (browser, view);
+    midori_view_set_uri (MIDORI_VIEW (view), "");
     /* FIXME: signal add-tab */
     _midori_browser_update_actions (browser);
-    midori_view_set_uri (MIDORI_VIEW (view), "");
+    midori_browser_notebook_page_reordered_cb (GTK_WIDGET (notebook),
+        MIDORI_VIEW (view), n, browser);
 }
 
 static gboolean
-midori_browser_notebook_tab_removed_cb (GtkWidget*         notebook,
+midori_browser_notebook_tab_removed_cb (GtkWidget* notebook,
                                         GraniteWidgetsTab* tab,
-                                        MidoriBrowser*     browser)
+                                        MidoriBrowser* browser)
 {
     MidoriView* view = MIDORI_VIEW (granite_widgets_tab_get_page (tab));
     if (midori_browser_tab_connected (browser, MIDORI_VIEW (view)))
         midori_browser_disconnect_tab (browser, MIDORI_VIEW (view));
+
+    GraniteWidgetsTab* new_tab = granite_widgets_dynamic_notebook_get_current (
+        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (notebook));
+    gint new_pos = granite_widgets_dynamic_notebook_get_tab_position (notebook, new_tab);
+    midori_browser_switched_tab (browser, tab,
+        MIDORI_VIEW (granite_widgets_tab_get_page (new_tab)), new_pos);
+    gtk_widget_destroy (view);
     return TRUE;
 }
 
 static void
-midori_browser_move_tab_to_notebook (MidoriBrowser*     browser,
-                                     GtkWidget*         view,
+midori_browser_move_tab_to_notebook (MidoriBrowser* browser,
+                                     GtkWidget* view,
                                      GraniteWidgetsTab* tab,
-                                     GtkWidget*         new_notebook)
+                                     GtkWidget* new_notebook)
 {
-    g_object_ref (tab);
-    _midori_browser_remove_tab (browser, view);
-    granite_widgets_dynamic_notebook_insert_tab (
-        GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (new_notebook), tab, 0);
+    gint n = midori_browser_add_uri (midori_browser_get_for_widget (new_notebook), midori_tab_get_uri (MIDORI_TAB (view)));
+    midori_browser_set_current_page (midori_browser_get_for_widget (new_notebook), n);
+    midori_view_set_tab (MIDORI_VIEW (view), midori_browser_get_current_tab (midori_browser_get_for_widget (new_notebook)));
     midori_browser_connect_tab (midori_browser_get_for_widget (new_notebook), view);
-    g_object_unref (tab);
 }
 
 static void