From 9f45efef926d17f40690af733f9e2d40b8d21db9 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 13 Apr 2006 20:44:45 +0000 Subject: [PATCH] 2006-04-13 [colin] 2.1.0cvs42 * src/textview.c Prevent gdk warnings --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/textview.c | 4 +++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb5eb2267..8a526b86f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-13 [colin] 2.1.0cvs42 + + * src/textview.c + Prevent gdk warnings + 2006-04-13 [colin] 2.1.0cvs41 * src/common/ssl_certificate.c diff --git a/PATCHSETS b/PATCHSETS index 83d835d27..17292af8c 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1413,3 +1413,4 @@ ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/fr/advanced.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/glossary.xml; ) > 2.1.0cvs39.patchset ( cvs diff -u -r 1.23.2.27 -r 1.23.2.28 src/plugins/spamassassin/spamassassin_gtk.c; ) > 2.1.0cvs40.patchset ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/ssl_certificate.h; cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/gtk/sslcertwindow.c; ) > 2.1.0cvs41.patchset +( cvs diff -u -r 1.96.2.109 -r 1.96.2.110 src/textview.c; ) > 2.1.0cvs42.patchset diff --git a/configure.ac b/configure.ac index 2019e8e86..918845777 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=41 +EXTRA_VERSION=42 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/textview.c b/src/textview.c index 90bde7af9..2b1bb5031 100644 --- a/src/textview.c +++ b/src/textview.c @@ -453,8 +453,10 @@ void textview_init(TextView *textview) #define CHANGE_TAG_COLOR(tagname, colorfg, colorbg) { \ tag = gtk_text_tag_table_lookup(tags, tagname); \ - if (tag) \ + if (tag && colorbg) \ g_object_set(G_OBJECT(tag), "foreground-gdk", colorfg, "paragraph-background-gdk", colorbg, NULL); \ + else if (tag) \ + g_object_set(G_OBJECT(tag), "foreground-gdk", colorfg, NULL); \ } static void textview_update_message_colors(TextView *textview) -- 2.25.1