[epiphany/history-rewrite] Add a EphyBrowseHistory property to EphyHistoryWindow
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/history-rewrite] Add a EphyBrowseHistory property to EphyHistoryWindow
- Date: Thu, 1 Sep 2011 16:47:54 +0000 (UTC)
commit bfd8c809ae8c383d7aeffa08ec642c13ca4b0767
Author: Claudio Saavedra <csaavedra igalia com>
Date: Fri Aug 26 18:33:28 2011 +0300
Add a EphyBrowseHistory property to EphyHistoryWindow
src/Makefile.am | 1 +
src/ephy-history-window.c | 17 ++++++++++++++++-
src/ephy-history-window.h | 1 +
3 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c46160c..64c130c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,6 +97,7 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/embed \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/history \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
-DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_API_VERSION)/extensions"\" \
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 8d6a5e4..d99f317 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -99,6 +99,7 @@ static void search_entry_search_cb (GtkWidget *entry,
struct _EphyHistoryWindowPrivate
{
EphyHistory *history;
+ EphyBrowseHistory *browse_history;
GtkWidget *sites_view;
GtkWidget *pages_view;
EphyNodeFilter *pages_filter;
@@ -119,7 +120,8 @@ struct _EphyHistoryWindowPrivate
enum
{
PROP_0,
- PROP_HISTORY
+ PROP_HISTORY,
+ PROP_BROWSE_HISTORY,
};
static const GtkActionEntry ephy_history_ui_entries [] = {
@@ -506,6 +508,13 @@ ephy_history_window_class_init (EphyHistoryWindowClass *klass)
"Global History",
EPHY_TYPE_HISTORY,
G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_CONSTRUCT_ONLY));
+ g_object_class_install_property (object_class,
+ PROP_BROWSE_HISTORY,
+ g_param_spec_object ("browse-history",
+ "Browse history",
+ "Browse History",
+ EPHY_TYPE_BROWSE_HISTORY,
+ G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (object_class, sizeof(EphyHistoryWindowPrivate));
}
@@ -1365,6 +1374,9 @@ ephy_history_window_set_property (GObject *object,
case PROP_HISTORY:
editor->priv->history = g_value_get_object (value);
break;
+ case PROP_BROWSE_HISTORY:
+ editor->priv->browse_history = g_value_get_object (value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -1384,6 +1396,9 @@ ephy_history_window_get_property (GObject *object,
case PROP_HISTORY:
g_value_set_object (value, editor->priv->history);
break;
+ case PROP_BROWSE_HISTORY:
+ g_value_set_object (value, editor->priv->browse_history);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 88ada34..8334605 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-browse-history.h"
G_BEGIN_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]