1 diff -r -U5 gtkhtml-3.24.4/config.h.in gtkhtml-3.24.4/config.h.in
2 --- gtkhtml-3.24.4/config.h.in 2008-09-22 04:21:36.000000000 +0200
3 +++ gtkhtml-3.24.4/config.h.in 2008-10-16 10:00:20.000000000 +0200
7 #undef GTKHTML_RELEASE_STRING
10 +#undef DISABLE_PRINTING
13 /* No deprecated bonobo functions */
14 #undef BONOBO_DISABLE_DEPRECATED
16 /* Editor API Version */
17 diff -r -U5 gtkhtml-3.24.4/configure.in gtkhtml-3.24.4/configure.in
18 --- gtkhtml-3.24.4/configure.in 2008-09-21 15:40:43.000000000 +0200
19 +++ gtkhtml-3.24.4/configure.in 2008-10-16 10:30:12.000000000 +0200
21 AC_INIT(gtkhtml/gtkhtml.c)
22 AM_CONFIG_HEADER(config.h)
28 # Required Package Versions
29 m4_define([gtk_minimum_version], [2.12.0])
30 m4_define([gail_minimum_version], [1.1.0])
31 m4_define([gnome_icon_theme_minimum_version], [1.2.0])
32 m4_define([libbonobo_minimum_version], [2.20.3])
35 AC_MSG_RESULT([$os_win32])
36 AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
39 -GNOME_COMPILE_WARNINGS(yes)
40 -CFLAGS="$CFLAGS $warning_flags"
41 +dnl GNOME_COMPILE_WARNINGS(yes)
42 +dnl CFLAGS="$CFLAGS $warning_flags"
50 -GAIL_MODULES="gail >= gail_minimum_version"
51 -PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
52 -AC_SUBST(GAIL_CFLAGS)
54 -AC_SUBST(GAIL_MODULES)
56 +dnl do we want a11y support?
60 + [ --enable-a11y Enable Accessibility (requires gail) [default=yes]],
61 + [ac_cv_enable_a11y=$enableval],[ac_cv_enable_a11y=yes])
62 +AC_MSG_CHECKING([whether to enable a11y])
63 +if test "$ac_cv_enable_a11y" = yes; then
65 + GAIL_MODULES="gail >= gail_minimum_version"
66 + PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
67 + AC_SUBST(GAIL_CFLAGS)
69 + AC_SUBST(GAIL_MODULES)
72 + A11Y_LA="../a11y/libgtkhtml-a11y.la"
76 + AC_DEFINE(DISABLE_A11Y)
77 + CFLAGS="-DDISABLE_A11Y $CFLAGS"
78 + PC_CFLAGS="-DDISABLE_A11Y $PC_CFLAGS"
83 +dnl do we want printing support?
85 +GNOMEPRINT_MODULES=""
86 +AC_ARG_ENABLE(printing,
87 + [ --enable-printing Enable Printing [default=yes]],
88 + [ac_cv_enable_printing=$enableval],[ac_cv_enable_printing=yes])
89 +AC_MSG_CHECKING([whether to enable printing])
90 +if test "$ac_cv_enable_printing" = yes; then
92 + GNOME_TEST_PROGRAMS="gtest test-suite test-stress"
95 + AC_DEFINE(DISABLE_PRINTING)
96 + CFLAGS="-DDISABLE_PRINTING $CFLAGS"
97 + PC_CFLAGS="-DDISABLE_PRINTING $PC_CFLAGS"
99 +AM_CONDITIONAL(HAVE_PRINTING, test x$ac_cv_enable_printing != xno)
102 +dnl do we want gnome support?
105 +AC_ARG_ENABLE(gnome,
106 + [ --enable-gnome Enable Gnome (requires many things) [default=yes]],
107 + [ac_cv_enable_gnome=$enableval],[ac_cv_enable_gnome=yes])
108 +AC_MSG_CHECKING([whether to enable gnome])
109 +if test "$ac_cv_enable_gnome" = yes; then
111 + GNOME_MODULES="libgnomeui-2.0 >= libgnomeui_minimum_version"
113 + dnl **************************************************
114 + dnl * Gnome Icon Theme
115 + dnl **************************************************
116 + PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0)
120 + AC_DEFINE(DISABLE_GNOME)
121 + CFLAGS="-DDISABLE_GNOME $CFLAGS"
122 + PC_CFLAGS="-DDISABLE_GNOME $PC_CFLAGS"
125 +dnl libglade only needed on windows?
126 +dnl GTKHTML_MODULES="$GNOME_MODULES $GAIL_MODULES libglade-2.0 >= libglade_minimum_version enchant iso-codes"
127 +GTKHTML_MODULES="$GNOME_MODULES $GAIL_MODULES gtk+-2.0 >= gtk_minimum_version gconf-2.0"
129 -GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version libgnomeui-2.0 >= libgnomeui_minimum_version libglade-2.0 >= libglade_minimum_version enchant gconf-2.0 iso-codes"
130 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
131 AC_SUBST(GTKHTML_CFLAGS)
132 AC_SUBST(GTKHTML_LIBS)
133 AC_SUBST(GTKHTML_MODULES)
136 AC_HELP_STRING([--with-bonobo-editor],
137 [build the older Bonobo-based editor [[default=no]]]),
138 bonobo_editor="$withval", bonobo_editor="no")
139 if test "x$bonobo_editor" = "xyes"; then
140 EDITOR_MODULES="${GTKHTML_MODULES} libbonobo-2.0 >= libbonobo_minimum_version libbonoboui-2.0 >= libbonoboui_minimum_version"
141 + # These are still needed for 'dist' targets.
142 + BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
143 + AC_SUBST(BONOBO_IDL_INCLUDES)
144 + ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
145 + AC_SUBST(ORBIT_IDL)
147 PKG_CHECK_MODULES(EDITOR, $EDITOR_MODULES)
148 AC_SUBST(EDITOR_CFLAGS)
149 AC_SUBST(EDITOR_LIBS)
151 + EDITOR_DIR="components"
152 + AC_SUBST(EDITOR_DIR)
155 + AC_DEFINE(DISABLE_EDITOR)
157 AM_CONDITIONAL(BONOBO_EDITOR, test x$bonobo_editor = xyes)
159 # Glade catalog files
160 AC_ARG_WITH(glade-catalog,
161 @@ -113,31 +194,20 @@
162 if test "x$glade_catalog" = "xyes"; then
163 PKG_CHECK_MODULES(GLADEUI, gladeui-1.0)
165 AM_CONDITIONAL(GLADE_CATALOG, test x$glade_catalog = xyes)
167 -# These are still needed for 'dist' targets.
168 -BONOBO_IDL_INCLUDES="-I`$PKG_CONFIG --variable=idldir libbonobo-2.0` -I`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
169 -AC_SUBST(BONOBO_IDL_INCLUDES)
170 -ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
173 dnl **********************************
174 dnl soup for testgtkhtml
175 dnl **********************************
177 PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_soup="yes", have_soup="no")
178 AM_CONDITIONAL(HAVE_SOUP, test x$have_soup != xno)
179 AC_SUBST(SOUP_CFLAGS)
182 dnl **************************************************
183 -dnl * Gnome Icon Theme
184 -dnl **************************************************
185 -PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
187 -dnl **************************************************
189 dnl **************************************************
191 AC_MSG_CHECKING([for iso-codes package])
193 @@ -214,10 +284,12 @@
195 AC_SUBST(GTKHTML_CURRENT)
196 AC_SUBST(GTKHTML_REVISION)
197 AC_SUBST(GTKHTML_AGE)
212 + accessibility support: $ac_cv_enable_a11y
213 + gnome-print support: $ac_cv_enable_printing
214 + gnome support: $ac_cv_enable_gnome
215 + bonobo-editor component: $bonobo_editor
217 Editor component type: ${GNOME_GTKHTML_EDITOR_TYPE}
219 diff -r -U5 gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.24.4/gtkhtml/gtkhtml.c
220 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c 2008-10-16 09:59:50.000000000 +0200
221 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c 2008-10-16 10:53:23.000000000 +0200
224 #include <gdk/gdkkeysyms.h>
225 #include <glib/gi18n-lib.h>
228 +#ifndef DISABLE_GNOME
229 +#include <libgnome/gnome-util.h>
232 +#ifndef DISABLE_A11Y
233 #include "../a11y/factory.h"
236 #include "htmlcolorset.h"
237 #include "htmlcluev.h"
238 #include "htmlcursor.h"
239 #include "htmldrawqueue.h"
241 #include "gtkhtml-search.h"
242 #include "gtkhtml-stream.h"
243 #include "gtkhtml-private.h"
244 #include "gtkhtml-properties.h"
246 -#include <libgnome/gnome-util.h>
249 DND_TARGET_TYPE_MESSAGE_RFC822,
250 DND_TARGET_TYPE_X_UID_LIST,
251 DND_TARGET_TYPE_TEXT_URI_LIST,
252 @@ -3044,11 +3049,14 @@
253 html_class->scroll = scroll;
254 html_class->cursor_move = cursor_move;
255 html_class->command = command;
257 add_bindings (klass);
259 +#ifndef DISABLE_A11Y
260 gtk_html_accessibility_init ();
261 +#endif /* ndef DISABLE_A11Y */
263 filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
264 gtk_rc_parse (filename);
266 html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
267 @@ -4053,11 +4061,11 @@
268 g_return_val_if_fail (GTK_IS_HTML (html), NULL);
270 return html->priv->base_url;
274 +#ifndef DISABLE_PRINTING
277 gtk_html_print_page (GtkHTML *html, GtkPrintContext *context)
279 g_return_if_fail (html != NULL);
280 @@ -4081,11 +4089,11 @@
282 html->engine, context, header_height, footer_height,
283 header_print, footer_print, user_data);
287 +#endif /* ndef DISABLE_PRINTING */
291 gtk_html_set_paragraph_style (GtkHTML *html,
292 GtkHTMLParagraphStyle style)
293 @@ -6075,11 +6083,11 @@
295 gtk_html_set_images_blocking (GtkHTML *html, gboolean block)
297 html->engine->block_images = block;
300 +#ifndef DISABLE_PRINTING
302 gtk_html_print_page_get_pages_num (GtkHTML *html,
303 GtkPrintContext *context,
304 gdouble header_height,
305 gdouble footer_height)
306 @@ -6103,10 +6111,11 @@
307 return html_engine_print_operation_run (
308 html->engine, operation, action, parent,
309 calc_header_height, calc_footer_height,
310 draw_header, draw_footer, user_data, error);
312 +#endif /* ndef DISABLE_PRINTING */
315 gtk_html_has_undo (GtkHTML *html)
317 return html_undo_has_undo_steps (html->engine->undo);
318 diff -r -U5 gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.c gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.c
319 --- gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.c 2008-06-13 05:05:58.000000000 +0200
320 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.c 2008-10-16 10:50:53.000000000 +0200
321 @@ -117,11 +117,13 @@
322 old_remove(container, child);
324 gtk_html_embedded_changed(GTK_HTML_EMBEDDED(container));
327 +#ifndef DISABLE_PRINTING
328 typedef void (*draw_print_signal)(GtkObject *, gpointer, gpointer);
329 +#endif /* ndef DISABLE_PRINTING */
330 typedef void (*draw_gdk_signal)(GtkObject *, gpointer, gpointer, gint, gint, gpointer);
333 draw_gdk_signal_marshaller (GClosure *closure,
334 GValue *return_value,
335 @@ -186,21 +188,21 @@
336 G_STRUCT_OFFSET (GtkHTMLEmbeddedClass, draw_gdk),
338 draw_gdk_signal_marshaller, G_TYPE_NONE, 4,
339 G_TYPE_POINTER, G_TYPE_POINTER,
340 G_TYPE_INT, G_TYPE_INT);
342 +#ifndef DISABLE_PRINTING
343 signals [DRAW_PRINT] =
344 g_signal_new ("draw_print",
345 G_TYPE_FROM_CLASS (object_class),
347 G_STRUCT_OFFSET (GtkHTMLEmbeddedClass, draw_print),
349 g_cclosure_marshal_VOID__POINTER,
353 +#endif /* ndef DISABLE_PRINTING */
354 gobject_class->finalize = gtk_html_embedded_finalize;
356 widget_class->size_request = gtk_html_embedded_size_request;
357 widget_class->size_allocate = gtk_html_embedded_size_allocate;
359 diff -r -U5 gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.h gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.h
360 --- gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.h 2008-07-18 08:18:37.000000000 +0200
361 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml-embedded.h 2008-10-16 10:00:55.000000000 +0200
363 GtkBinClass parent_class;
365 void (*changed)(GtkHTMLEmbedded *);
366 void (*draw_gdk)(GtkHTMLEmbedded *, GdkPixmap *, GdkGC *,
368 +#ifndef DISABLE_PRINTING
369 void (*draw_print)(GtkHTMLEmbedded *, GtkPrintContext *);
370 +#endif /* ndef DISABLE_PRINTING */
373 /* FIXME: There needs to be a way for embedded objects in forms to encode
374 themselves for a form */
376 diff -r -U5 gtkhtml-3.24.4/gtkhtml/gtkhtml.h gtkhtml-3.24.4/gtkhtml/gtkhtml.h
377 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.h 2008-08-18 06:54:55.000000000 +0200
378 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.h 2008-10-16 10:49:41.000000000 +0200
379 @@ -208,11 +208,11 @@
381 /* Animated Images */
382 void gtk_html_set_animate (GtkHTML *html,
384 gboolean gtk_html_get_animate (const GtkHTML *html);
386 +#ifndef DISABLE_PRINTING
387 /* Printing support. */
388 void gtk_html_print_page_with_header_footer (GtkHTML *html,
389 GtkPrintContext *context,
390 gdouble header_height,
391 gdouble footer_height,
392 @@ -233,11 +233,11 @@
393 GtkHTMLPrintCalcHeight calc_footer_height,
394 GtkHTMLPrintDrawFunc draw_header,
395 GtkHTMLPrintDrawFunc draw_footer,
399 +#endif /* ndef DISABLE_PRINTING */
401 const gchar *gtk_html_get_title (GtkHTML *html);
402 void gtk_html_set_title (GtkHTML *html, const char *title);
405 diff -r -U5 gtkhtml-3.24.4/gtkhtml/gtkhtml-types.h gtkhtml-3.24.4/gtkhtml/gtkhtml-types.h
406 --- gtkhtml-3.24.4/gtkhtml/gtkhtml-types.h 2008-04-11 13:14:42.000000000 +0200
407 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml-types.h 2008-10-16 10:47:22.000000000 +0200
409 /* FIXME 1st param should be Engine */
410 typedef gboolean (* GtkHTMLSaveReceiverFn) (gpointer engine,
415 +#ifndef DISABLE_PRINTING
416 typedef gint (*GtkHTMLPrintCalcHeight) (GtkHTML *html,
417 GtkPrintOperation *operation,
418 GtkPrintContext *context,
420 typedef void (*GtkHTMLPrintDrawFunc) (GtkHTML *html,
425 typedef void (*GtkHTMLPrintCallback) (GtkHTML *html, GtkPrintContext *print_context,
426 gdouble x, gdouble y, gdouble width, gdouble height, gpointer user_data);
428 +#endif /* ndef DISABLE_PRINTING */
430 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlengine.c gtkhtml-3.24.4/gtkhtml/htmlengine.c
431 --- gtkhtml-3.24.4/gtkhtml/htmlengine.c 2008-10-16 09:59:50.000000000 +0200
432 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.c 2008-10-16 10:02:08.000000000 +0200
434 #include "htmlengine-edit.h"
435 #include "htmlengine-edit-cursor.h"
436 #include "htmlengine-edit-movement.h"
437 #include "htmlengine-edit-cut-and-paste.h"
438 #include "htmlengine-edit-selection-updater.h"
439 +#ifndef DISABLE_PRINTING
440 #include "htmlengine-print.h"
441 +#endif /* ndef DISABLE_PRINTING */
442 #include "htmlcolor.h"
443 #include "htmlinterval.h"
444 #include "htmlobject.h"
445 #include "htmlsettings.h"
446 #include "htmltext.h"
447 @@ -4382,13 +4384,13 @@
449 engine->selection_updater = html_engine_edit_selection_updater_new (engine);
451 engine->search_info = NULL;
452 engine->need_spell_check = FALSE;
454 +#ifndef DISABLE_PRINTING
455 html_engine_print_set_min_split_index (engine, .75);
457 +#endif /* ndef DISABLE_PRINTING */
458 engine->block = FALSE;
459 engine->block_images = FALSE;
460 engine->save_data = FALSE;
461 engine->saved_step_count = -1;
463 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlengine-print.c gtkhtml-3.24.4/gtkhtml/htmlengine-print.c
464 --- gtkhtml-3.24.4/gtkhtml/htmlengine-print.c 2008-04-11 13:14:42.000000000 +0200
465 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-print.c 2008-10-16 10:01:30.000000000 +0200
467 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
468 Boston, MA 02110-1301, USA.
473 +#ifndef DISABLE_PRINTING
476 #include <glib/gi18n-lib.h>
478 #include "gtkhtmldebug.h"
479 #include "gtkhtml-private.h"
481 operation, "end-print",
482 G_CALLBACK (engine_print_end_print), &data);
484 return gtk_print_operation_run (operation, action, parent, error);
487 +#endif /* ndef DISABLE_PRINTING */
488 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlengine-print.h gtkhtml-3.24.4/gtkhtml/htmlengine-print.h
489 --- gtkhtml-3.24.4/gtkhtml/htmlengine-print.h 2008-04-11 13:14:42.000000000 +0200
490 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-print.h 2008-10-16 10:46:24.000000000 +0200
494 #ifndef _HTMLENGINE_PRINT_H
495 #define _HTMLENGINE_PRINT_H
497 +#ifndef DISABLE_PRINTING
500 #include "htmlengine.h"
502 void html_engine_print (HTMLEngine *engine,
503 GtkPrintContext *context,
505 GtkHTMLPrintCalcHeight calc_footer_height,
506 GtkHTMLPrintDrawFunc draw_header,
507 GtkHTMLPrintDrawFunc draw_footer,
511 +#endif /* ndef DISABLE_PRINTING */
513 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlframe.c gtkhtml-3.24.4/gtkhtml/htmlframe.c
514 --- gtkhtml-3.24.4/gtkhtml/htmlframe.c 2008-07-18 08:18:37.000000000 +0200
515 +++ gtkhtml-3.24.4/gtkhtml/htmlframe.c 2008-10-16 10:48:54.000000000 +0200
516 @@ -165,11 +165,11 @@
519 HTMLFrame *frame = HTML_FRAME (o);
520 HTMLEngine *e = GTK_HTML (frame->html)->engine;
523 +#ifndef DISABLE_PRINTING
524 if (GTK_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
525 gint pixel_size = html_painter_get_pixel_size (e->painter);
527 if (!html_object_intersect (o, &paint, x, y, width, height))
529 @@ -178,25 +178,30 @@
531 width - pixel_size * (html_engine_get_left_border (e) + html_engine_get_right_border (e)),
532 height - pixel_size * (html_engine_get_top_border (e) + html_engine_get_bottom_border (e)),
533 tx + pixel_size * html_engine_get_left_border (e), ty + pixel_size * html_engine_get_top_border (e));
535 +#endif /* ndef DISABLE_PRINTING */
536 (*HTML_OBJECT_CLASS (parent_class)->draw) (o, p, x, y, width, height, tx, ty);
540 set_painter (HTMLObject *o, HTMLPainter *painter)
544 frame = HTML_FRAME (o);
545 - if (G_OBJECT_TYPE (GTK_HTML (frame->html)->engine->painter) != HTML_TYPE_PRINTER) {
546 +#ifndef DISABLE_PRINTING
547 + if (G_OBJECT_TYPE (GTK_HTML (frame->html)->engine->painter) != HTML_TYPE_PRINTER)
548 +#endif /* ndef DISABLE_PRINTING */
549 frame_set_gdk_painter (frame, GTK_HTML (frame->html)->engine->painter);
552 +#ifdef DISABLE_PRINTING
553 + html_engine_set_painter (GTK_HTML (frame->html)->engine, frame->gdk_painter);
554 +#else /* def DISABLE_PRINTING */
555 html_engine_set_painter (GTK_HTML (frame->html)->engine,
556 GTK_OBJECT_TYPE (painter) != HTML_TYPE_PRINTER ? frame->gdk_painter : painter);
561 forall (HTMLObject *self,
563 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmliframe.c gtkhtml-3.24.4/gtkhtml/htmliframe.c
564 --- gtkhtml-3.24.4/gtkhtml/htmliframe.c 2008-07-18 08:18:37.000000000 +0200
565 +++ gtkhtml-3.24.4/gtkhtml/htmliframe.c 2008-10-16 10:45:41.000000000 +0200
566 @@ -164,10 +164,11 @@
569 gint width, gint height,
572 +#ifndef DISABLE_PRINTING
573 HTMLIFrame *iframe = HTML_IFRAME (o);
574 HTMLEngine *e = GTK_HTML (iframe->html)->engine;
577 if (GTK_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
578 @@ -180,25 +181,30 @@
580 width - pixel_size * (html_engine_get_left_border (e) + html_engine_get_right_border (e)),
581 height - pixel_size * (html_engine_get_top_border (e) + html_engine_get_bottom_border (e)),
582 tx + pixel_size * html_engine_get_left_border (e), ty + pixel_size * html_engine_get_top_border (e));
584 +#endif /* ndef DISABLE_PRINTING */
585 (*HTML_OBJECT_CLASS (parent_class)->draw) (o, p, x, y, width, height, tx, ty);
589 set_painter (HTMLObject *o, HTMLPainter *painter)
593 iframe = HTML_IFRAME (o);
594 - if (G_OBJECT_TYPE (GTK_HTML (iframe->html)->engine->painter) != HTML_TYPE_PRINTER) {
595 +#ifndef DISABLE_PRINTING
596 + if (G_OBJECT_TYPE (GTK_HTML (iframe->html)->engine->painter) != HTML_TYPE_PRINTER)
598 iframe_set_gdk_painter (iframe, GTK_HTML (iframe->html)->engine->painter);
601 +#ifdef DISABLE_PRINTING
602 + html_engine_set_painter (GTK_HTML (iframe->html)->engine, iframe->gdk_painter);
603 +#else /* def DISABLE_PRINTING */
604 html_engine_set_painter (GTK_HTML (iframe->html)->engine,
605 G_OBJECT_TYPE (painter) != HTML_TYPE_PRINTER ? iframe->gdk_painter : painter);
606 +#endif /* ndef DISABLE_PRINTING */
610 forall (HTMLObject *self,
612 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlimage.c gtkhtml-3.24.4/gtkhtml/htmlimage.c
613 --- gtkhtml-3.24.4/gtkhtml/htmlimage.c 2008-06-13 05:05:58.000000000 +0200
614 +++ gtkhtml-3.24.4/gtkhtml/htmlimage.c 2008-10-16 10:43:40.000000000 +0200
615 @@ -383,14 +383,14 @@
617 if (painter->widget && GTK_IS_HTML (painter->widget))
618 e = html_object_engine (HTML_OBJECT (image), GTK_HTML (painter->widget)->engine);
622 +#ifndef DISABLE_PRINTING
623 if (HTML_IS_PRINTER (painter))
627 p = HTML_GDK_PAINTER (painter);
628 /* printf ("draw_image_focus\n"); */
630 gdk_gc_set_foreground (p->gc, &html_colorset_get_color_allocated (e->settings->color_set,
631 painter, HTMLTextColor)->color);
632 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlprinter.c gtkhtml-3.24.4/gtkhtml/htmlprinter.c
633 --- gtkhtml-3.24.4/gtkhtml/htmlprinter.c 2008-07-18 08:18:37.000000000 +0200
634 +++ gtkhtml-3.24.4/gtkhtml/htmlprinter.c 2008-10-16 10:02:28.000000000 +0200
636 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
637 Boston, MA 02110-1301, USA.
642 +#ifndef DISABLE_PRINTING
644 #include "gtkhtml-compat.h"
650 painter = HTML_PAINTER (printer);
652 printer->scale = scale;
653 painter->engine_to_pango = scale;
656 +#endif /* ndef DISABLE_PRINTING */
657 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmlprinter.h gtkhtml-3.24.4/gtkhtml/htmlprinter.h
658 --- gtkhtml-3.24.4/gtkhtml/htmlprinter.h 2008-07-18 08:18:37.000000000 +0200
659 +++ gtkhtml-3.24.4/gtkhtml/htmlprinter.h 2008-10-16 10:02:34.000000000 +0200
661 #define _HTMLPRINTER_H
664 #include "htmlpainter.h"
666 +#ifndef DISABLE_PRINTING
668 #define HTML_TYPE_PRINTER (html_printer_get_type ())
669 #define HTML_PRINTER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), HTML_TYPE_PRINTER, HTMLPrinter))
670 #define HTML_PRINTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), HTML_TYPE_PRINTER, HTMLPrinterClass))
671 #define HTML_IS_PRINTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), HTML_TYPE_PRINTER))
672 #define HTML_IS_PRINTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HTML_TYPE_PRINTER))
674 gdouble html_printer_scale_to_gnome_print (HTMLPrinter *printer,
676 void html_printer_set_scale (HTMLPrinter *printer,
679 +#endif /* ndef DISABLE_PRINTING */
680 #endif /* _HTMLPRINTER_H */
681 diff -r -U5 gtkhtml-3.24.4/gtkhtml/htmltextslave.c gtkhtml-3.24.4/gtkhtml/htmltextslave.c
682 --- gtkhtml-3.24.4/gtkhtml/htmltextslave.c 2008-04-11 13:14:42.000000000 +0200
683 +++ gtkhtml-3.24.4/gtkhtml/htmltextslave.c 2008-10-16 10:42:53.000000000 +0200
684 @@ -860,14 +860,14 @@
686 if (painter->widget && GTK_IS_HTML (painter->widget))
687 e = html_object_engine (HTML_OBJECT (slave->owner), GTK_HTML (painter->widget)->engine);
691 +#ifndef DISABLE_PRINTING
692 if (HTML_IS_PRINTER (painter))
695 +#endif /* ndef DISABLE_PRINTING */
696 p = HTML_GDK_PAINTER (painter);
697 /* printf ("draw_text_focus\n"); */
699 gdk_gc_set_foreground (p->gc, &html_colorset_get_color_allocated (e->settings->color_set,
700 painter, HTMLTextColor)->color);
701 diff -r -U5 gtkhtml-3.24.4/gtkhtml/libgtkhtml.pc.in gtkhtml-3.24.4/gtkhtml/libgtkhtml.pc.in
702 --- gtkhtml-3.24.4/gtkhtml/libgtkhtml.pc.in 2008-04-11 13:14:42.000000000 +0200
703 +++ gtkhtml-3.24.4/gtkhtml/libgtkhtml.pc.in 2008-10-16 10:02:54.000000000 +0200
706 Description: libgtkhtml
707 Requires: @GTKHTML_MODULES@
709 Libs: -L${libdir} -lgtkhtml-@GTKHTML_API_VERSION@
710 -Cflags: -I${includedir}/libgtkhtml-@GTKHTML_API_VERSION@
711 +Cflags: -I${includedir}/libgtkhtml-@GTKHTML_API_VERSION@ @PC_CFLAGS@
712 diff -r -U5 gtkhtml-3.24.4/gtkhtml/Makefile.am gtkhtml-3.24.4/gtkhtml/Makefile.am
713 --- gtkhtml-3.24.4/gtkhtml/Makefile.am 2008-05-12 09:18:34.000000000 +0200
714 +++ gtkhtml-3.24.4/gtkhtml/Makefile.am 2008-10-16 10:33:55.000000000 +0200
715 @@ -207,22 +207,25 @@
716 htmlengine-edit-table.h \
717 $(PLATFORM_DEP_SOURCES) \
720 libgtkhtml_3_14_la_LDFLAGS = -version-info $(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
721 -libgtkhtml_3_14_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
722 +libgtkhtml_3_14_la_LIBADD = $(GTKHTML_LIBS) $(A11Y_LA) $(GAIL_LIBS) $(REGEX_LIBS)
725 mkdir $(distdir)/tests
726 cp -f $(srcdir)/tests/*.html $(distdir)/tests
727 cp -f $(srcdir)/tests/*.jpg $(distdir)/tests
730 test_programs = testgtkhtml
732 -noinst_PROGRAMS = $(test_programs) gtest test-suite test-stress
734 +gnome_test_programs = gtest test-suite test-stress
737 +noinst_PROGRAMS = $(test_programs) $(gnome_test_programs)
739 testgtkhtml_SOURCES = \
743 diff -r -U5 gtkhtml-3.24.4/Makefile.am gtkhtml-3.24.4/Makefile.am
744 --- gtkhtml-3.24.4/Makefile.am 2008-08-01 08:36:01.000000000 +0200
745 +++ gtkhtml-3.24.4/Makefile.am 2008-10-16 10:03:52.000000000 +0200
758 po/.intltool-merge-cache