From: Paul Mangan <paul@claws-mail.org>
Date: Mon, 17 Feb 2003 10:32:39 +0000 (+0000)
Subject: sync with 0.8.10cvs13
X-Git-Tag: rel_0_8_11~110
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f5f8a360aa0ad255f6ed73ce7cabb6c6efc599b5;ds=sidebyside

sync with 0.8.10cvs13
---

diff --git a/ChangeLog b/ChangeLog
index f05eb693f..486242057 100644
--- 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 8812340ba..9a94ddaed 100644
--- 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 760feb2bd..98b0ba798 100644
--- 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 4897332bf..4380389c1 100644
--- 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 11dc581d6..0913b87ff 100644
--- 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;
 }