aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2011-08-29 17:22:17 +0800
committerXan Lopez <xan@igalia.com>2012-03-07 04:49:46 +0800
commit55505414d65ebe71a7f82d68472ed69fdb2a8f51 (patch)
tree5a6412b850cb00b28c7152c4b60def86e392034d /src
parenta6bc39ed6369c703cc4d5d8e35d91bb5d4aa48c6 (diff)
downloadgsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.tar
gsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.tar.gz
gsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.tar.bz2
gsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.tar.lz
gsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.tar.xz
gsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.tar.zst
gsoc2013-epiphany-55505414d65ebe71a7f82d68472ed69fdb2a8f51.zip
Set the history service during history window instantiation
The old history object is kept for now but it will be removed later
Diffstat (limited to 'src')
-rw-r--r--src/ephy-history-window.c4
-rw-r--r--src/ephy-history-window.h3
-rw-r--r--src/ephy-shell.c6
3 files changed, 10 insertions, 3 deletions
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 5c4b4efe1..7074dd770 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,
+ EphyHistoryService *history_service)
{
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,
+ "history-service", history_service,
NULL));
ephy_history_window_construct (editor);
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 88ada347f..70c861e88 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -28,6 +28,7 @@
#include "ephy-node-view.h"
#include "ephy-history.h"
+#include "ephy-history-service.h"
G_BEGIN_DECLS
@@ -55,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, EphyHistoryService *history_service);
void ephy_history_window_set_parent (EphyHistoryWindow *ehw,
GtkWidget *window);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 68da6cdf8..c9c575f91 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;
+ EphyHistoryService *service;
if (shell->priv->history_window == NULL) {
history = EPHY_HISTORY
(ephy_embed_shell_get_global_history (embed_shell));
+ service = EPHY_HISTORY_SERVICE
+ (ephy_embed_shell_get_global_history_service (embed_shell));
g_assert (history != NULL);
- shell->priv->history_window = ephy_history_window_new (history);
+ shell->priv->history_window = ephy_history_window_new (history,
+ service);
g_signal_connect (shell->priv->history_window, "show",
G_CALLBACK (toolwindow_show_cb), shell);