2006-01-28 [colin] 1.9.100cvs194

	* src/gtk/gtksourceprintjob.c
		Don't fiddle with PangoLayout when we
		have an image

diff --git a/ChangeLog b/ChangeLog
index 7af415e212a232a502c79d8ae7fb6c63c53b3171..8747494d8f1f719aa257fa619ede3fbbab468876 100644 (file)
--- 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 575b98ce1bd90b5c7f61f92b2d9cc9d942998325..2ad8591f1186f6e2135305d76206c675e4107045 100644 (file)
--- 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 5ccdde74de059ef5742b0ccf40a01c76b09f8567..18b97dee506bb908b89c6c56c311c96445d9d8a0 100644 (file)
--- 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 81ff754baaca1205a10d5c2657de50e8b9b82af5..e835d336283ddef5a798d2caab5f4d31496b0b13 100644 (file)
--- 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: <horrible-hack> 
         * For empty paragraphs, pango_layout_iter_get_baseline() returns 0,