Merge branches/MarkieB/gtkmain to trunk.

svn path=/trunk/netsurf/; revision=9729

1 files changed, 18 insertions, 1 deletions

diff --git a/amiga/gui.c b/amiga/gui.c
index bd8d4cb28..ebd5d6657 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -47,6 +47,7 @@
 #include "amiga/menu.h"
 #include "amiga/options.h"
 #include <libraries/keymap.h>
+#include "desktop/save_complete.h"
 #include "desktop/textinput.h"
 #include <intuition/pointerclass.h>
 #include <math.h>
@@ -66,7 +67,6 @@
 #include "amiga/cookies.h"
 #include "amiga/clipboard.h"
 #include <proto/keymap.h>
-#include "amiga/save_complete.h"
 #include "amiga/fetch_file.h"
 #include "amiga/fetch_mailto.h"
 #include "amiga/search.h"
@@ -3410,6 +3410,23 @@ void gui_window_stop_throbber(struct gui_window *g)
 //	g->shared->throbber_frame = 0;
 }
 
+/**
+ * function to add retrieved favicon to gui
+ */
+void gui_window_set_icon(struct gui_window *g, struct content *icon)
+{
+}
+
+/**
+ * set gui display of a retrieved favicon representing the search
+ * provider
+ * \param ico may be NULL for local calls; then access current cache from
+ * search_web_ico()
+ */
+void gui_window_set_search_ico(struct content *ico)
+{
+}
+
 void ami_update_throbber(struct gui_window_2 *g,bool redraw)
 {
 	struct IBox *bbox;