+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
( 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
MICRO_VERSION=100
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=169
+EXTRA_VERSION=170
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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);
+ }
}
}
}
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;
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) {