From 4d4d74c8cd1a77a46cbe0816cf6150f8b4980947 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Tue, 18 Mar 2014 22:32:52 +0000
Subject: move page search gui callbacks to their own operations table

---
 desktop/gui_factory.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

(limited to 'desktop/gui_factory.c')

diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 638abfd96..ecedf417b 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -343,6 +343,62 @@ static nserror verify_utf8_register(struct gui_utf8_table *gut)
 	return NSERROR_OK;
 }
 
+static void gui_default_status(bool found, void *p)
+{
+}
+
+static void gui_default_hourglass(bool active, void *p)
+{
+}
+
+static void gui_default_add_recent(const char *string, void *p)
+{
+}
+
+static void gui_default_forward_state(bool active, void *p)
+{
+}
+
+static void gui_default_back_state(bool active, void *p)
+{
+}
+
+static struct gui_search_table default_search_table = {
+	.status = gui_default_status,
+	.hourglass = gui_default_hourglass,
+	.add_recent = gui_default_add_recent,
+	.forward_state = gui_default_forward_state,
+	.back_state = gui_default_back_state,
+};
+
+/** verify search table is valid */
+static nserror verify_search_register(struct gui_search_table *gst)
+{
+	/* check table is present */
+	if (gst == NULL) {
+		return NSERROR_BAD_PARAMETER;
+	}
+
+	/* fill in the optional entries with defaults */
+	if (gst->status == NULL) {
+		gst->status = default_search_table.status;
+	}
+	if (gst->hourglass == NULL) {
+		gst->hourglass = default_search_table.hourglass;
+	}
+	if (gst->add_recent == NULL) {
+		gst->add_recent = default_search_table.add_recent;
+	}
+	if (gst->forward_state == NULL) {
+		gst->forward_state = default_search_table.forward_state;
+	}
+	if (gst->back_state == NULL) {
+		gst->back_state = default_search_table.back_state;
+	}
+
+	return NSERROR_OK;
+}
+
 static nsurl *gui_default_get_resource_url(const char *path)
 {
 	return NULL;
@@ -525,7 +581,7 @@ nserror gui_factory_register(struct gui_table *gt)
 
 	/* utf8 table */
 	if (gt->utf8 == NULL) {
-		/* set default clipboard table */
+		/* set default utf8 table */
 		gt->utf8 = &default_utf8_table;
 	}
 	err = verify_utf8_register(gt->utf8);
@@ -533,6 +589,16 @@ nserror gui_factory_register(struct gui_table *gt)
 		return err;
 	}
 
+	/* search table */
+	if (gt->search == NULL) {
+		/* set default search table */
+		gt->search = &default_search_table;
+	}
+	err = verify_search_register(gt->search);
+	if (err != NSERROR_OK) {
+		return err;
+	}
+
 	guit = gt;
 
 	return NSERROR_OK;
-- 
cgit v1.2.3