Index: plugins/calendar-weather/ChangeLog
===================================================================
--- plugins/calendar-weather/ChangeLog	(revision 34410)
+++ plugins/calendar-weather/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2007-10-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #308815
+
+	* calendar-weather.c: (e_plugin_lib_enable): Colors for categories
+	are deprecated now, prototype of 'e_categories_add' has been changed,
+	so propagate this change here too.
+
 2007-05-24  Matthew Barnes  <mbarnes@redhat.com>
 
 	* calendar-weather.c (e_calendar_weather_location):
Index: plugins/calendar-weather/calendar-weather.c
===================================================================
--- plugins/calendar-weather/calendar-weather.c	(revision 34410)
+++ plugins/calendar-weather/calendar-weather.c	(working copy)
@@ -57,13 +57,13 @@
 		}
 	}
 	if (!found) {
-		e_categories_add (_("Weather: Cloudy"), NULL, WEATHER_DATADIR "/category_weather_cloudy_16.png", FALSE);
-		e_categories_add (_("Weather: Fog"), NULL, WEATHER_DATADIR "/category_weather_fog_16.png", FALSE);
-		e_categories_add (_("Weather: Partly Cloudy"), NULL, WEATHER_DATADIR "/category_weather_partly_cloudy_16.png", FALSE);
-		e_categories_add (_("Weather: Rain"), NULL, WEATHER_DATADIR "/category_weather_rain_16.png", FALSE);
-		e_categories_add (_("Weather: Snow"), NULL, WEATHER_DATADIR "/category_weather_snow_16.png", FALSE);
-		e_categories_add (_("Weather: Sunny"), NULL, WEATHER_DATADIR "/category_weather_sun_16.png", FALSE);
-		e_categories_add (_("Weather: Thunderstorms"), NULL, WEATHER_DATADIR "/category_weather_tstorm_16.png", FALSE);
+		e_categories_add (_("Weather: Cloudy"), WEATHER_DATADIR "/category_weather_cloudy_16.png", FALSE);
+		e_categories_add (_("Weather: Fog"), WEATHER_DATADIR "/category_weather_fog_16.png", FALSE);
+		e_categories_add (_("Weather: Partly Cloudy"), WEATHER_DATADIR "/category_weather_partly_cloudy_16.png", FALSE);
+		e_categories_add (_("Weather: Rain"), WEATHER_DATADIR "/category_weather_rain_16.png", FALSE);
+		e_categories_add (_("Weather: Snow"), WEATHER_DATADIR "/category_weather_snow_16.png", FALSE);
+		e_categories_add (_("Weather: Sunny"), WEATHER_DATADIR "/category_weather_sun_16.png", FALSE);
+		e_categories_add (_("Weather: Thunderstorms"), WEATHER_DATADIR "/category_weather_tstorm_16.png", FALSE);
 	}
 
 	return 0;
Index: calendar/ChangeLog
===================================================================
--- calendar/ChangeLog	(revision 34410)
+++ calendar/ChangeLog	(working copy)
@@ -1,3 +1,12 @@
+2007-10-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #308815
+
+	* conduits/common/libecalendar-common-conduit.c:
+	(e_pilot_remote_category_to_local): Colors for categories are
+	deprecated now, prototype of 'e_categories_add' has been changed,
+	so propagate this change here too.
+
 2007-10-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #417999
Index: calendar/conduits/common/libecalendar-common-conduit.c
===================================================================
--- calendar/conduits/common/libecalendar-common-conduit.c	(revision 34410)
+++ calendar/conduits/common/libecalendar-common-conduit.c	(working copy)
@@ -172,7 +172,7 @@
 		if(e_categories_exist(category_string) == FALSE){
 			/* add if it doesn't exist */
 			LOG(g_message("Category created on pc\n"));
-			e_categories_add(category_string, NULL, NULL, TRUE);
+			e_categories_add(category_string, NULL, TRUE);
 		}
 	}
 
