2006-01-19 [wwp] 1.9.100cvs170

	* src/gtk/quicksearch.c
	* src/compose.c
		force text color to black when yellow background is set

diff --git a/ChangeLog b/ChangeLog
index 591e7e2f31585e552c70da0ca86680d467638000..2cefc13eb3a259d37663aea77f629e688d4b2775 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-19 [wwp]       1.9.100cvs170
+
+       * src/gtk/quicksearch.c
+       * src/compose.c
+               force text color to black when yellow background is set
+
 2006-01-19 [colin]     1.9.100cvs169
 
        * src/plugins/trayicon/trayicon.c

diff --git a/PATCHSETS b/PATCHSETS
index b5c88975e71b518d39a7b184fc8cbffbcd19993a..0484fe82ee4afb9a9779278be6de392e56717d1b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1153,3 +1153,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 doc/man/sylpheed-claws.1;  ) > 1.9.100cvs167.patchset
 ( cvs diff -u -r 1.382.2.226 -r 1.382.2.227 src/compose.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/gtk/quicksearch.c;  ) > 1.9.100cvs168.patchset
 ( cvs diff -u -r 1.14.2.32 -r 1.14.2.33 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs169.patchset
+( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/gtk/quicksearch.c;  cvs diff -u -r 1.382.2.227 -r 1.382.2.228 src/compose.c;  ) > 1.9.100cvs170.patchset

diff --git a/configure.ac b/configure.ac
index 48d2d083966887d0264b5cba70a6d1f7dc05d87c..ef26a0de9a6c50682da8b57ef5217372f5d4a17c 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=169
+EXTRA_VERSION=170
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 823e8f8d5608e6b85dc920d69739f59d326242fd..5e521c8f2d1435878639aa155e93e5b2a6b338a9 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1823,25 +1823,32 @@ void compose_entry_append(Compose *compose, const gchar *address,
 void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
 {
        static GdkColor yellow;
+       static GdkColor black;
        static gboolean yellow_initialised = FALSE;
        GSList *h_list;
        GtkEntry *entry;
                
        if (!yellow_initialised) {
                gdk_color_parse("#f5f6be", &yellow);
+               gdk_color_parse("#000000", &black);
                yellow_initialised = gdk_colormap_alloc_color(
                        gdk_colormap_get_system(), &yellow, FALSE, TRUE);
-               
+               yellow_initialised &= gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &black, FALSE, TRUE);
        }
 
        for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
                entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
                if (gtk_entry_get_text(entry) && 
                    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
-                       if (yellow_initialised)
+                       if (yellow_initialised) {
                                gtk_widget_modify_base(
                                        GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
                                        GTK_STATE_NORMAL, &yellow);
+                               gtk_widget_modify_text(
+                                       GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+                                       GTK_STATE_NORMAL, &black);
+                       }
                }
        }
 }

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 4c3b8a35248039613bba6eb43ffb06e945ebb7bd..5ea7f58cc767ece7f15b68e023be6f20d8b402e9 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -532,12 +532,16 @@ gboolean quicksearch_is_active(QuickSearch *quicksearch)
 static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
 {
        static GdkColor yellow;
+       static GdkColor black;
        static gboolean yellow_initialised = FALSE;
 
        if (!yellow_initialised) {
                gdk_color_parse("#f5f6be", &yellow);
+               gdk_color_parse("#000000", &black);
                yellow_initialised = gdk_colormap_alloc_color(
                        gdk_colormap_get_system(), &yellow, FALSE, TRUE);
+               yellow_initialised &= gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &black, FALSE, TRUE);
                
        }
        quicksearch->active = active;
@@ -548,12 +552,18 @@ static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
                        gtk_widget_modify_base(
                                GTK_COMBO(quicksearch->search_string_entry)->entry, 
                                GTK_STATE_NORMAL, &yellow);
+                       gtk_widget_modify_text(
+                               GTK_COMBO(quicksearch->search_string_entry)->entry, 
+                               GTK_STATE_NORMAL, &black);
        } else {
                gtk_widget_set_sensitive(quicksearch->clear_search, FALSE);
                if (yellow_initialised)
                        gtk_widget_modify_base(
                                GTK_COMBO(quicksearch->search_string_entry)->entry, 
                                GTK_STATE_NORMAL, NULL);
+                       gtk_widget_modify_text(
+                               GTK_COMBO(quicksearch->search_string_entry)->entry, 
+                               GTK_STATE_NORMAL, NULL);
        }
        
        if (!active) {