[epiphany/history-rewrite-second] Set the history object on history window instantiation

[Claudio Saavedra <csaavedra src gnome org>]

commit 5173dde6e5e2ae17617fc368ad65d35f6f1f1f75
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Mon Aug 29 12:22:17 2011 +0300

    Set the history object on history window instantiation
    
    The old history object is kept for now but it will be removed later

 src/ephy-history-window.c |    4 +++-
 src/ephy-history-window.h |    2 +-
 src/ephy-shell.c          |    6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 71a8378..52d0250 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -1341,7 +1341,8 @@ ephy_history_window_set_parent (EphyHistoryWindow *ebe,
 }
 
 GtkWidget *
-ephy_history_window_new (EphyHistory *history)
+ephy_history_window_new (EphyHistory *history,
+                         EphyBrowseHistory *b_history)
 {
 	EphyHistoryWindow *editor;
 
@@ -1350,6 +1351,7 @@ ephy_history_window_new (EphyHistory *history)
 	editor = EPHY_HISTORY_WINDOW (g_object_new
 			(EPHY_TYPE_HISTORY_WINDOW,
 			 "history", history,
+			 "browse-history", b_history,
 			 NULL));
 
 	ephy_history_window_construct (editor);
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 8334605..c56d65d 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -56,7 +56,7 @@ typedef struct
 
 GType		     ephy_history_window_get_type (void);
 
-GtkWidget	    *ephy_history_window_new        (EphyHistory *history);
+GtkWidget	    *ephy_history_window_new        (EphyHistory *history, EphyBrowseHistory *b_history);
 
 void		     ephy_history_window_set_parent (EphyHistoryWindow *ehw,
 						     GtkWidget *window);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 68da6cd..a7e53e2 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -1030,12 +1030,16 @@ GtkWidget *
 ephy_shell_get_history_window (EphyShell *shell)
 {
   EphyHistory *history;
+  EphyBrowseHistory *b_history;
 
   if (shell->priv->history_window == NULL) {
     history = EPHY_HISTORY
       (ephy_embed_shell_get_global_history (embed_shell));
+    b_history = EPHY_BROWSE_HISTORY
+      (ephy_embed_shell_get_global_browse_history (embed_shell));
     g_assert (history != NULL);
-    shell->priv->history_window = ephy_history_window_new (history);
+    shell->priv->history_window = ephy_history_window_new (history,
+                                                           b_history);
 
     g_signal_connect (shell->priv->history_window, "show",
                       G_CALLBACK (toolwindow_show_cb), shell);