sync with 0.8.10cvs13

diff --git a/ChangeLog b/ChangeLog
index f05eb693f759ca373c6a6c29e955f8d04bc421bc..48624205781de14ec721b12c496c50bb3666e0df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-17
+
+       * src/colorlabel.c: don't use pixmaps for label color rect but draw
+         rectangles so we can respect the color map of palette based visuals
+         (fixes the long time crashes on Solaris - thanks to Alfons
+         Hoogervorst).
+
 2003-02-17
 
        * src/procheader.c: procheader_date_parse(): made month string case

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8812340ba39767354dd8d03eb39618fe233363d1..9a94ddaed4ed912a65b45a5696fef52adb624da9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-17 [paul]      0.8.10claws17
+
+       * sync with 0.8.10cvs13
+               see ChangeLog 2003-02-17
+
 2003-02-17 [paul]      0.8.10claws16
 
        * sync with 0.8.10cvs12

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 760feb2bd40bd9e53fbb0a27b01dc41fc5e6ac01..98b0ba798d2f3f357ed8d8cd8dd5beaa496c32aa 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2003-02-17
+
+       * src/colorlabel.c: ¥«¥é¡¼¥é¥Ù¥ë¤Î¶ë·Á¤Ë pixmap ¤ò»È¤ï¤º¡¢¶ë·Á¤ò
+         ÉÁ²è¤¹¤ë¤è¤¦¤Ë¤·¡¢¥Ñ¥ì¥Ã¥È¥Ù¡¼¥¹¤Î²èÌ̤Υ«¥é¡¼¥Þ¥Ã¥×¤Ë½¾¤¦¤è¤¦
+         ¤Ë¤·¤¿(Ĺ´ü¤ËÅϤë Solaris ¤Ç¤Î¥¯¥é¥Ã¥·¥å¤ò½¤Àµ - Alfons
+         Hoogervorst ¤µ¤ó thanks)¡£
+
 2003-02-17
 
        * src/procheader.c: procheader_date_parse(): ·î¤Îʸ»úÎó¤òÂ羮ʸ»ú¤ò

diff --git a/configure.ac b/configure.ac
index 4897332bf32f1cad085dee783e01c2bda0211ad2..4380389c151cac5616993574a73ed538fd10f317 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws16
+EXTRA_VERSION=claws17
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/colorlabel.c b/src/colorlabel.c
index 11dc581d63510c68eba5cee69b9d2b4921ada84e..0913b87ffce313b16cf22b2448bcce34e345078c 100644 (file)
--- a/src/colorlabel.c
+++ b/src/colorlabel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2001-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -133,7 +133,7 @@ static gboolean colorlabel_drawing_area_expose_event_cb
                           widget->allocation.height);
 
        gdk_gc_unref(gc);                          
-       
+
        return FALSE;
 }
 
@@ -150,8 +150,10 @@ static GtkWidget *colorlabel_create_color_widget(GdkColor color)
                         (CL(b)))
 
        gtk_signal_connect(GTK_OBJECT(widget), "expose_event", 
-                          colorlabel_drawing_area_expose_event_cb,
-                          GINT_TO_POINTER( (gint) CR(color.red, color.green, color.blue )));
+                          GTK_SIGNAL_FUNC
+                               (colorlabel_drawing_area_expose_event_cb),
+                          GINT_TO_POINTER
+                               ((gint)CR(color.red, color.green, color.blue)));
 
        return widget;
 }