Re: [evolution-patches] patch for bug #61766 (calendar folder color thingy)

[Not Zed <notzed ximian com>]

should get_colour just always return something instead?

otherwise this'll have to be done anywhere the colour is used.  unless it needs to know if it is unset.

On Mon, 2004-08-09 at 14:42 -0400, Jeffrey Stedfast wrote:

since no one told me what the default color should be, I simply chose
white. but whatever.

trivial fix.

Jeff

text/plain attachment (61766.patch)

? color.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.323
diff -u -r1.323 ChangeLog
--- ChangeLog	2 Aug 2004 18:32:14 -0000	1.323
+++ ChangeLog	9 Aug 2004 18:41:43 -0000
@@ -1,3 +1,9 @@
+2004-08-09  Jeffrey Stedfast  <fejj novell com>
+
+	* e-source-selector.c (pixbuf_cell_data_func): If we can't get a
+	colour for the row, default to white (for lack of a better default
+	colour?). Fixes bug #61766.
+
 2004-08-01  JP Rosevear  <jpr novell com>
 
 	* e-pilot-settings.c (e_pilot_settings_get_source): accessor
Index: e-source-selector.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-source-selector.c,v
retrieving revision 1.22
diff -u -r1.22 e-source-selector.c
--- e-source-selector.c	20 Jul 2004 16:36:43 -0000	1.22
+++ e-source-selector.c	9 Aug 2004 18:41:43 -0000
@@ -21,7 +21,10 @@
  * Author: Ettore Perazzoli <ettore ximian com>
  */
 
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-source-selector.h"
 
@@ -36,6 +39,9 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkcellrendererpixbuf.h>
 
+
+#define E_SOURCE_DEFAULT_COLOR (0x00ffffff)
+
 #define PARENT_TYPE gtk_tree_view_get_type ()
 static GtkTreeViewClass *parent_class = NULL;
 
@@ -418,11 +424,12 @@
 		g_assert (E_IS_SOURCE (data));
 		source = E_SOURCE (data);
 		
-		if (e_source_get_color (source, &color)) {
-			pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 16, 16);
-			gdk_pixbuf_fill (pixbuf, color << 8);
-		}
-			
+		if (!e_source_get_color (source, &color))
+			color = E_SOURCE_DEFAULT_COLOR;
+		
+		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 16, 16);
+		gdk_pixbuf_fill (pixbuf, color << 8);
+		
 		g_object_set (renderer,
 			      "visible", pixbuf != NULL,
 			      "pixbuf", pixbuf,

-- 







Michael Zucchi <notzed ximian com>

"born to die, live to work, it's all downhill from here"

Novell's Evolution and Free Software Developer