summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-05-10 12:20:24 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2013-05-10 12:20:24 +0100
commit51a16104c7d6a15188cb366d6c1a5e68fc600002 (patch)
tree915da1075b08a8d6013b09d601272e913f198d3f /gtk
parentd2d04824cfc088cf6776fe2c2e2abdb953dfe006 (diff)
parent631265ef6b06ee5ffe33fae793360d651984d91d (diff)
downloadnetsurf-51a16104c7d6a15188cb366d6c1a5e68fc600002.tar.gz
netsurf-51a16104c7d6a15188cb366d6c1a5e68fc600002.tar.bz2
Merge branch 'tlsa/selection-search-refactor'
Diffstat (limited to 'gtk')
-rw-r--r--gtk/scaffolding.c1
-rw-r--r--gtk/search.c1
-rw-r--r--gtk/selection.c1
-rw-r--r--gtk/window.c3
4 files changed, 1 insertions, 5 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 8f1f4447e..5abda6276 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -48,7 +48,6 @@
#include "desktop/save_text.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
-#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "gtk/cookies.h"
diff --git a/gtk/search.c b/gtk/search.c
index 3d6bba05d..d4fbadcc8 100644
--- a/gtk/search.c
+++ b/gtk/search.c
@@ -36,7 +36,6 @@
#include "desktop/gui.h"
#include "desktop/search.h"
#include "desktop/searchweb.h"
-#include "desktop/selection.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
diff --git a/gtk/selection.c b/gtk/selection.c
index 7d516e944..b0978b385 100644
--- a/gtk/selection.c
+++ b/gtk/selection.c
@@ -22,7 +22,6 @@
#include "utils/log.h"
#include "desktop/gui.h"
-#include "desktop/selection.h"
#include "desktop/browser.h"
#include "gtk/selection.h"
#include "gtk/window.h"
diff --git a/gtk/window.c b/gtk/window.c
index 663ff32a3..798181ae1 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -33,7 +33,6 @@
#include "desktop/options.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
-#include "desktop/selection.h"
#include "gtk/compat.h"
#include "gtk/gui.h"
#include "gtk/scaffolding.h"
@@ -1080,7 +1079,7 @@ void gui_drag_save_object(gui_save_type type, hlcache_handle *c,
}
-void gui_drag_save_selection(struct selection *s, struct gui_window *g)
+void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
}