summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2008-04-13 21:58:43 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2008-04-13 21:58:43 +0000
commit48431f9674b85f9713a29249c5ce2babf661b5f7 (patch)
tree532603f8e445e465576f26dde8f159468f81e5a0
parent5c8406bf8b9eec4a216a92cc72de53c8ee23ba7c (diff)
downloadnetsurf-48431f9674b85f9713a29249c5ce2babf661b5f7.tar.gz
netsurf-48431f9674b85f9713a29249c5ce2babf661b5f7.tar.bz2
Remove text export build config option. Tidy up save_text code.
svn path=/trunk/netsurf/; revision=4095
-rw-r--r--desktop/save_text.c6
-rw-r--r--desktop/save_text.h3
-rw-r--r--utils/config.h1
3 files changed, 2 insertions, 8 deletions
diff --git a/desktop/save_text.c b/desktop/save_text.c
index 3258a75ee..13dc8dfd0 100644
--- a/desktop/save_text.c
+++ b/desktop/save_text.c
@@ -33,8 +33,6 @@
#include "utils/utf8.h"
#include "utils/utils.h"
-#ifdef WITH_TEXT_EXPORT
-
static void extract_text(struct box *box, bool *first,
save_text_whitespace *before, struct save_text_state *save);
static bool save_text_add_to_buffer(const char *text, size_t length,
@@ -59,7 +57,7 @@ void save_as_text(struct content *c, char *path)
utf8_convert_ret ret;
char *result;
- if (c && c->type != CONTENT_HTML) {
+ if (!c || c->type != CONTENT_HTML) {
return;
}
@@ -292,5 +290,3 @@ bool save_text_add_to_buffer(const char *text, size_t length, struct box *box,
return true;
}
-
-#endif
diff --git a/desktop/save_text.h b/desktop/save_text.h
index b452f7353..825d08f63 100644
--- a/desktop/save_text.h
+++ b/desktop/save_text.h
@@ -24,8 +24,7 @@
#ifndef _NETSURF_DESKTOP_SAVE_TEXT_H_
#define _NETSURF_DESKTOP_SAVE_TEXT_H_
-#include "render/box.h"
-
+struct box;
struct content;
/* text currently being saved */
diff --git a/utils/config.h b/utils/config.h
index ce23fc0aa..4bce5d8a6 100644
--- a/utils/config.h
+++ b/utils/config.h
@@ -92,7 +92,6 @@ char *strndup(const char *s, size_t n);
/* Export modules */
#define WITH_SAVE_COMPLETE
#define WITH_DRAW_EXPORT
- #define WITH_TEXT_EXPORT
#endif
#endif