From 222bada835f2ca12fa6e8b6cef5651a1e5417b88 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 28 Jan 2006 09:41:42 +0000 Subject: [PATCH 1/1] 2006-01-28 [colin] 1.9.100cvs194 * src/gtk/gtksourceprintjob.c Don't fiddle with PangoLayout when we have an image --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtksourceprintjob.c | 20 ++++++++------------ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7af415e21..8747494d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-28 [colin] 1.9.100cvs194 + + * src/gtk/gtksourceprintjob.c + Don't fiddle with PangoLayout when we + have an image + 2006-01-28 [paul] 1.9.100cvs193 * AUTHORS diff --git a/PATCHSETS b/PATCHSETS index 575b98ce1..2ad8591f1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1177,3 +1177,4 @@ ( cvs diff -u -r 1.42.2.19 -r 1.42.2.20 po/fr.po; cvs diff -u -r 1.34.2.15 -r 1.34.2.16 po/it.po; ) > 1.9.100cvs191.patchset ( cvs diff -u -r 1.395.2.159 -r 1.395.2.160 src/summaryview.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtksourceprintjob.c; ) > 1.9.100cvs192.patchset ( cvs diff -u -r 1.100.2.34 -r 1.100.2.35 AUTHORS; cvs diff -u -r 1.9.2.3 -r 1.9.2.4 po/el.po; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 po/zh_CN.po; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/authors.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 tools/claws.i18n.status.pl; ) > 1.9.100cvs193.patchset +( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtksourceprintjob.c; ) > 1.9.100cvs194.patchset diff --git a/configure.ac b/configure.ac index 5ccdde74d..18b97dee5 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=193 +EXTRA_VERSION=194 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/gtksourceprintjob.c b/src/gtk/gtksourceprintjob.c index 81ff754ba..e835d3362 100644 --- a/src/gtk/gtksourceprintjob.c +++ b/src/gtk/gtksourceprintjob.c @@ -1345,6 +1345,11 @@ create_layout_for_para (GtkSourcePrintJob *job, seg = seg->next; } + if (image != NULL) { + *is_image = TRUE; + return image; + } + layout = pango_layout_new (job->priv->pango_context); pango_layout_set_width (layout, job->priv->text_width * PANGO_SCALE); @@ -1380,18 +1385,9 @@ create_layout_for_para (GtkSourcePrintJob *job, if (job->priv->tab_array) pango_layout_set_tabs (layout, job->priv->tab_array); - if (image == NULL) { - pango_layout_set_text (layout, text->str, text->len); - pango_layout_set_attributes (layout, attrs); - *is_image = FALSE; - } else { - pango_layout_set_text(layout, "IMAGE\n", 6); - *is_image = TRUE; - pango_attr_list_unref(attrs); - g_string_free(text, TRUE); - g_free(layout); - return image; - } + pango_layout_set_text (layout, text->str, text->len); + pango_layout_set_attributes (layout, attrs); + *is_image = FALSE; /* FIXME: * For empty paragraphs, pango_layout_iter_get_baseline() returns 0, -- 2.25.1