r4095 tlsa - in /trunk/netsurf: desktop/save_text.c desktop/save_text.h utils/config.h

[netsurf at semichrome.net]

Author: tlsa
Date: Sun Apr 13 16:58:43 2008
New Revision: 4095

URL: http://source.netsurf-browser.org?rev=4095&view=rev
Log:
Remove text export build config option. Tidy up save_text code.

Modified:
    trunk/netsurf/desktop/save_text.c
    trunk/netsurf/desktop/save_text.h
    trunk/netsurf/utils/config.h

Modified: trunk/netsurf/desktop/save_text.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/save_text.c?rev=4095&r1=4094&r2=4095&view=diff
==============================================================================
--- trunk/netsurf/desktop/save_text.c (original)
+++ trunk/netsurf/desktop/save_text.c Sun Apr 13 16:58:43 2008
@@ -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 @@
 	utf8_convert_ret ret;
 	char *result;
 
-	if (c && c->type != CONTENT_HTML) {
+	if (!c || c->type != CONTENT_HTML) {
 		return;
 	}
 
@@ -292,5 +290,3 @@
 
 	return true;
 }
-
-#endif

Modified: trunk/netsurf/desktop/save_text.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/save_text.h?rev=4095&r1=4094&r2=4095&view=diff
==============================================================================
--- trunk/netsurf/desktop/save_text.h (original)
+++ trunk/netsurf/desktop/save_text.h Sun Apr 13 16:58:43 2008
@@ -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 */

Modified: trunk/netsurf/utils/config.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=4095&r1=4094&r2=4095&view=diff
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sun Apr 13 16:58:43 2008
@@ -92,7 +92,6 @@
     /* Export modules */
     #define WITH_SAVE_COMPLETE
     #define WITH_DRAW_EXPORT
-    #define WITH_TEXT_EXPORT
 #endif
 
 #endif