Add an "add-page" signal to the EphyHistory object that can be used to

2005-08-28  Crispin Flowerday  <gnome@flowerday.cx>

	* embed/ephy-history.c: (ephy_history_class_init),
	(internal_get_host), (ephy_history_get_host),
	(ephy_history_add_host), (ephy_history_add_page), (impl_add_page):
	* embed/ephy-history.h:
	* lib/ephy-marshal.list:

	Add an "add-page" signal to the EphyHistory object that can be
	used to block urls from appearing in the history.

	Also make the ephy_history_get_host() function not create
	the EphyNode if it doesn't already exist.

4 files changed, 68 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 2bc520e74..dde4e70a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-08-28  Crispin Flowerday  <gnome@flowerday.cx>
+
+	* embed/ephy-history.c: (ephy_history_class_init),
+	(internal_get_host), (ephy_history_get_host),
+	(ephy_history_add_host), (ephy_history_add_page), (impl_add_page):
+	* embed/ephy-history.h:
+	* lib/ephy-marshal.list:
+
+	Add an "add-page" signal to the EphyHistory object that can be
+	used to block urls from appearing in the history. 
+
+	Also make the ephy_history_get_host() function not create
+	the EphyNode if it doesn't already exist.
+
 2005-08-28  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-notebook.c: (drag_stop), (grab_broken_event_cb),
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index d3c64d286..ce0f9e017 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -69,6 +69,7 @@ enum
 
 enum
 {
+	ADD_PAGE,
 	VISITED,
 	CLEARED,
 	REDIRECT,
@@ -80,6 +81,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 static void ephy_history_class_init	(EphyHistoryClass *klass);
 static void ephy_history_init		(EphyHistory *history);
 static void ephy_history_finalize	(GObject *object);
+static gboolean impl_add_page           (EphyHistory *histroy, const char *url);
 
 static GObjectClass *parent_class = NULL;
 
@@ -170,6 +172,8 @@ ephy_history_class_init (EphyHistoryClass *klass)
 	object_class->get_property = ephy_history_get_property;
 	object_class->set_property = ephy_history_set_property;
 
+	klass->add_page = impl_add_page;
+
 	g_object_class_install_property (object_class,
 					 PROP_ENABLED,
 					 g_param_spec_boolean ("enabled",
@@ -178,6 +182,17 @@ ephy_history_class_init (EphyHistoryClass *klass)
 							       TRUE,
 							       G_PARAM_READWRITE));
 
+	signals[ADD_PAGE] =
+		g_signal_new ("add_page",
+			      G_OBJECT_CLASS_TYPE (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyHistoryClass, add_page),
+			      g_signal_accumulator_true_handled, NULL,
+			      ephy_marshal_BOOLEAN__STRING,
+			      G_TYPE_BOOLEAN,
+			      1,
+			      G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
+
 	signals[VISITED] =
                 g_signal_new ("visited",
                               G_OBJECT_CLASS_TYPE (object_class),
@@ -657,18 +672,7 @@ ephy_history_host_visited (EphyHistory *eh,
 }
 
 static EphyNode *
-ephy_history_add_host (EphyHistory *eh, EphyNode *page)
-{
-	const char *url;
-
-	url = ephy_node_get_property_string
-		(page, EPHY_NODE_PAGE_PROP_LOCATION);
-
-	return ephy_history_get_host (eh, url);
-}
-
-EphyNode *
-ephy_history_get_host (EphyHistory *eh, const char *url)
+internal_get_host (EphyHistory *eh, const char *url, gboolean create)
 {
 	GnomeVFSURI *vfs_uri = NULL;
 	EphyNode *host = NULL;
@@ -740,7 +744,7 @@ ephy_history_get_host (EphyHistory *eh, const char *url)
 		if (host) break;
 	}
 
-	if (!host)
+	if (!host && create)
 	{
 		host = ephy_node_new (eh->priv->db);
 		ephy_node_signal_connect_object (host,
@@ -773,7 +777,10 @@ ephy_history_get_host (EphyHistory *eh, const char *url)
 		ephy_node_add_child (eh->priv->hosts, host);
 	}
 
-	ephy_history_host_visited (eh, host, now);
+	if (host)
+	{
+		ephy_history_host_visited (eh, host, now);
+	}
 
 	if (vfs_uri)
 	{
@@ -786,6 +793,23 @@ ephy_history_get_host (EphyHistory *eh, const char *url)
 	return host;
 }
 
+EphyNode *
+ephy_history_get_host (EphyHistory *eh, const char *url)
+{
+	return internal_get_host (eh, url, FALSE);
+}
+
+static EphyNode *
+ephy_history_add_host (EphyHistory *eh, EphyNode *page)
+{
+	const char *url;
+
+	url = ephy_node_get_property_string
+		(page, EPHY_NODE_PAGE_PROP_LOCATION);
+
+	return internal_get_host (eh, url, TRUE);
+}
+
 static void
 ephy_history_visited (EphyHistory *eh, EphyNode *node)
 {
@@ -857,22 +881,30 @@ ephy_history_get_page_visits (EphyHistory *gh,
 }
 
 void
-ephy_history_add_page (EphyHistory *eb,
+ephy_history_add_page (EphyHistory *eh,
 		       const char *url)
 {
+	gboolean result = FALSE;
+
+	g_signal_emit (eh, signals[ADD_PAGE], 0, url, &result);
+}
+
+static gboolean
+impl_add_page (EphyHistory *eb, const char *url)
+{
 	EphyNode *bm, *node, *host;
 	GValue value = { 0, };
 
 	if (eb->priv->enabled == FALSE)
 	{
-		return;
+		return FALSE;
 	}
 
 	node = ephy_history_get_page (eb, url);
 	if (node)
 	{
 		ephy_history_visited (eb, node);
-		return;
+		return TRUE;
 	}
 
 	bm = ephy_node_new (eb->priv->db);
@@ -897,6 +929,8 @@ ephy_history_add_page (EphyHistory *eb,
 
 	ephy_node_add_child (host, bm);
 	ephy_node_add_child (eb->priv->pages, bm);
+
+	return TRUE;
 }
 
 EphyNode *
diff --git a/embed/ephy-history.h b/embed/ephy-history.h
index 740440f05..fcaf7d039 100644
--- a/embed/ephy-history.h
+++ b/embed/ephy-history.h
@@ -64,6 +64,8 @@ struct _EphyHistoryClass
         GObjectClass parent_class;
 
 	/* Signals */
+	gboolean (* add_page)	(EphyHistory *history,
+				 const char *url);
 	void	(* visited)	(EphyHistory *history,
 				 const char *url);
 	void	(* cleared)	(EphyHistory *history);
diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list
index e4a2425c5..bbc8f2d40 100644
--- a/lib/ephy-marshal.list
+++ b/lib/ephy-marshal.list
@@ -1,6 +1,7 @@
 BOOLEAN:BOXED
 BOOLEAN:ENUM,STRING,STRING,STRING
 BOOLEAN:OBJECT
+BOOLEAN:STRING
 BOOLEAN:STRING,STRING
 BOOLEAN:STRING,STRING,STRING
 BOOLEAN:VOID