Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.2106
diff -u -p -r1.2106 ChangeLog
--- addressbook/ChangeLog	18 Sep 2006 17:16:25 -0000	1.2106
+++ addressbook/ChangeLog	27 Sep 2006 15:23:33 -0000
@@ -1,3 +1,12 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	Fixes bug #357970
+
+	* gui/contact-editor/e-contact-editor.c:
+	* gui/widgets/e-minicard.c:
+	* gui/widgets/eab-contact-display.c:
+	Don't call deprecated GLib / GDK functions.
+
 2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	Fixes bug #351332
Index: addressbook/gui/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.264
diff -u -p -r1.264 e-contact-editor.c
--- addressbook/gui/contact-editor/e-contact-editor.c	24 Jul 2006 13:06:10 -0000	1.264
+++ addressbook/gui/contact-editor/e-contact-editor.c	27 Sep 2006 15:23:35 -0000
@@ -2783,7 +2783,7 @@ update_preview_cb (GtkFileChooser *file_
 
 	gtk_image_set_from_pixbuf (GTK_IMAGE (preview), pixbuf);
 	if (pixbuf)
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (pixbuf);
 }
 
 static void
Index: addressbook/gui/widgets/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-minicard.c,v
retrieving revision 1.130
diff -u -p -r1.130 e-minicard.c
--- addressbook/gui/widgets/e-minicard.c	18 Sep 2006 17:16:25 -0000	1.130
+++ addressbook/gui/widgets/e-minicard.c	27 Sep 2006 15:23:36 -0000
@@ -423,7 +423,7 @@ e_minicard_dispose (GObject *object)
 	}
 
 	if (e_minicard->list_icon_pixbuf) {
-		gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
+		g_object_unref (e_minicard->list_icon_pixbuf);
 		e_minicard->list_icon_pixbuf = NULL;
 	}
 
Index: addressbook/gui/widgets/eab-contact-display.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-contact-display.c,v
retrieving revision 1.31
diff -u -p -r1.31 eab-contact-display.c
--- addressbook/gui/widgets/eab-contact-display.c	24 Jul 2006 13:06:19 -0000	1.31
+++ addressbook/gui/widgets/eab-contact-display.c	27 Sep 2006 15:23:36 -0000
@@ -730,7 +730,7 @@ eab_contact_display_render_compact (EABC
 				}
 			}
 
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (pixbuf);
 			gtk_html_stream_printf (html_stream, "<img width=\"%d\" height=\"%d\" src=\"internal-contact-photo:\">",
 						calced_width, calced_height);
 			e_contact_photo_free (photo);
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3123
diff -u -p -r1.3123 ChangeLog
--- calendar/ChangeLog	21 Sep 2006 05:40:58 -0000	1.3123
+++ calendar/ChangeLog	27 Sep 2006 15:23:46 -0000
@@ -1,3 +1,22 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	Fixes bug #357970
+
+	* gui/e-alarm-list.c:
+	* gui/e-calendar-table.c:
+	* gui/e-day-view.c:
+	* gui/e-meeting-attendee.c:
+	* gui/e-meeting-store.c:
+	* gui/e-meeting-time-sel-item.c:
+	* gui/e-meeting-time-sel.c:
+	* gui/e-week-view-main-item.c:
+	* gui/e-week-view.c:
+	* gui/gnome-cal.c:
+	* gui/goto.c:
+	* gui/dialogs/event-page.c:
+	* gui/dialogs/task-page.c:
+	Don't call deprecated GLib / GDK functions.
+
 2006-09-21  Srinivasa Ragavan  <sragavan@novell.com>
 	
 	** Fix for bug #354775
Index: calendar/gui/e-alarm-list.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-alarm-list.c,v
retrieving revision 1.14
diff -u -p -r1.14 e-alarm-list.c
--- calendar/gui/e-alarm-list.c	8 Feb 2006 13:06:02 -0000	1.14
+++ calendar/gui/e-alarm-list.c	27 Sep 2006 15:23:47 -0000
@@ -393,31 +393,31 @@ get_alarm_duration_string (struct icaldu
 
 	if (duration->days >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d days before start of appointment" */
-		g_string_sprintf (string, ngettext("%d day", "%d days", duration->days), duration->days);
+		g_string_printf (string, ngettext("%d day", "%d days", duration->days), duration->days);
 		have_something = TRUE;
 	}
 
 	if (duration->weeks >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" */
-		g_string_sprintf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
+		g_string_printf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
 		have_something = TRUE;
 	}
 
 	if (duration->hours >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d hours before start of appointment" */
-		g_string_sprintf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
+		g_string_printf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
 		have_something = TRUE;
 	}
 
 	if (duration->minutes >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" */
-		g_string_sprintf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
+		g_string_printf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
 		have_something = TRUE;
 	}
 
 	if (duration->seconds >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" */
-		g_string_sprintf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
+		g_string_printf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
 		have_something = TRUE;
 	}
 
Index: calendar/gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.156
diff -u -p -r1.156 e-calendar-table.c
--- calendar/gui/e-calendar-table.c	10 Aug 2006 07:34:29 -0000	1.156
+++ calendar/gui/e-calendar-table.c	27 Sep 2006 15:23:47 -0000
@@ -492,7 +492,7 @@ e_calendar_table_init (ECalendarTable *c
 
 	pixbuf = e_icon_factory_get_icon ("stock_check-filled", E_ICON_SIZE_LIST);
 	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	gdk_pixbuf_unref(pixbuf);
+	g_object_unref(pixbuf);
 
 	/* Create the table */
 
Index: calendar/gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.303
diff -u -p -r1.303 e-day-view.c
--- calendar/gui/e-day-view.c	28 Jul 2006 09:25:19 -0000	1.303
+++ calendar/gui/e-day-view.c	27 Sep 2006 15:23:54 -0000
@@ -1527,7 +1527,7 @@ e_day_view_unrealize (GtkWidget *widget)
 
 	day_view = E_DAY_VIEW (widget);
 
-	gdk_gc_unref (day_view->main_gc);
+	g_object_unref (day_view->main_gc);
 	day_view->main_gc = NULL;
 
 	colormap = gtk_widget_get_colormap (widget);
@@ -2750,7 +2750,7 @@ e_day_view_find_work_week_start		(EDayVi
 	   week start day. */
 
 	/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-	weekday = g_date_weekday (&date) % 7;
+	weekday = g_date_get_weekday (&date) % 7;
 
 	/* Calculate the first working day of the week, 0 (Sun) to 6 (Sat).
 	   It will automatically default to the week start day if no days
@@ -2771,9 +2771,9 @@ e_day_view_find_work_week_start		(EDayVi
 		g_date_subtract_days (&date, offset);
 	}
 
-	tt.year = g_date_year (&date);
-	tt.month = g_date_month (&date);
-	tt.day = g_date_day (&date);
+	tt.year = g_date_get_year (&date);
+	tt.month = g_date_get_month (&date);
+	tt.day = g_date_get_day (&date);
 
 	return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 }
@@ -3463,7 +3463,7 @@ e_day_view_convert_event_coords (EDayVie
 	}
 
 	while (event_window && event_window != window
-	       && event_window != GDK_ROOT_PARENT()) {
+	       && event_window != gdk_get_default_root_window ()) {
 		gdk_window_get_position (event_window, &win_x, &win_y);
 		event_x += win_x;
 		event_y += win_y;
Index: calendar/gui/e-meeting-attendee.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-attendee.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-meeting-attendee.c
--- calendar/gui/e-meeting-attendee.c	8 Feb 2006 13:06:02 -0000	1.13
+++ calendar/gui/e-meeting-attendee.c	27 Sep 2006 15:23:55 -0000
@@ -875,7 +875,7 @@ e_meeting_attendee_add_busy_period (EMee
 	priv->has_calendar_info = TRUE;
 	priv->busy_periods_sorted = FALSE;
 
-	period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
+	period_in_days = g_date_get_julian (&period.end.date) - g_date_get_julian (&period.start.date) + 1;
 	priv->longest_period_in_days = MAX (priv->longest_period_in_days, period_in_days);
 
 	return TRUE;
Index: calendar/gui/e-meeting-store.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-meeting-store.c
--- calendar/gui/e-meeting-store.c	10 Apr 2006 10:11:16 -0000	1.19
+++ calendar/gui/e-meeting-store.c	27 Sep 2006 15:23:56 -0000
@@ -1276,17 +1276,17 @@ refresh_busy_periods (gpointer data)
 		struct icaltimetype itt;
 				
 		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->start.date);
-		itt.month = g_date_month (&qdata->start.date);
-		itt.day = g_date_day (&qdata->start.date);
+		itt.year = g_date_get_year (&qdata->start.date);
+		itt.month = g_date_get_month (&qdata->start.date);
+		itt.day = g_date_get_day (&qdata->start.date);
 		itt.hour = qdata->start.hour;
 		itt.minute = qdata->start.minute;
 		fbd->startt = icaltime_as_timet_with_zone (itt, priv->zone);
 
 		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->end.date);
-		itt.month = g_date_month (&qdata->end.date);
-		itt.day = g_date_day (&qdata->end.date);
+		itt.year = g_date_get_year (&qdata->end.date);
+		itt.month = g_date_get_month (&qdata->end.date);
+		itt.day = g_date_get_day (&qdata->end.date);
 		itt.hour = qdata->end.hour;
 		itt.minute = qdata->end.minute;
 		fbd->endt = icaltime_as_timet_with_zone (itt, priv->zone);
Index: calendar/gui/e-meeting-time-sel-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel-item.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-meeting-time-sel-item.c
--- calendar/gui/e-meeting-time-sel-item.c	18 Sep 2006 13:04:34 -0000	1.19
+++ calendar/gui/e-meeting-time-sel-item.c	27 Sep 2006 15:23:57 -0000
@@ -218,9 +218,9 @@ e_meeting_time_selector_item_unrealize (
 
 	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
 
-	gdk_gc_unref (mts_item->main_gc);
+	g_object_unref (mts_item->main_gc);
 	mts_item->main_gc = NULL;
-	gdk_gc_unref (mts_item->stipple_gc);
+	g_object_unref (mts_item->stipple_gc);
 	mts_item->stipple_gc = NULL;
 
 	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)
@@ -891,14 +891,14 @@ e_meeting_time_selector_item_button_pres
 
 	/* Set the new meeting time. */
 	e_meeting_time_selector_set_meeting_time (mts_item->mts,
-						  g_date_year (start_date),
-						  g_date_month (start_date),
-						  g_date_day (start_date),
+						  g_date_get_year (start_date),
+						  g_date_get_month (start_date),
+						  g_date_get_day (start_date),
 						  start_time.hour,
 						  start_time.minute,
-						  g_date_year (end_date),
-						  g_date_month (end_date),
-						  g_date_day (end_date),
+						  g_date_get_year (end_date),
+						  g_date_get_month (end_date),
+						  g_date_get_day (end_date),
 						  end_time.hour,
 						  end_time.minute);
 
Index: calendar/gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.78
diff -u -p -r1.78 e-meeting-time-sel.c
--- calendar/gui/e-meeting-time-sel.c	18 Sep 2006 13:04:34 -0000	1.78
+++ calendar/gui/e-meeting-time-sel.c	27 Sep 2006 15:23:59 -0000
@@ -271,7 +271,6 @@ e_meeting_time_selector_construct (EMeet
 	GtkWidget *hbox, *vbox, *separator, *label, *table, *sw;
 	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
 	GSList *group;
-	GdkColormap *colormap;
 	guint accel_key;
 	time_t meeting_start_time;
 	struct tm *meeting_start_tm;
@@ -284,7 +283,7 @@ e_meeting_time_selector_construct (EMeet
 	   future, in working hours. */
 	meeting_start_time = time (NULL);
 	g_date_clear (&mts->meeting_start_time.date, 1);
-	g_date_set_time (&mts->meeting_start_time.date, meeting_start_time);
+	g_date_set_time_t (&mts->meeting_start_time.date, meeting_start_time);
 	meeting_start_tm = localtime (&meeting_start_time);
 	mts->meeting_start_time.hour = meeting_start_tm->tm_hour;
 	mts->meeting_start_time.minute = meeting_start_tm->tm_min;
@@ -651,14 +650,13 @@ e_meeting_time_selector_construct (EMeet
 	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
 
 	/* Allocate the colors. */
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
 	e_meeting_time_selector_alloc_named_color (mts, "snow", &mts->bg_color);
 	e_meeting_time_selector_alloc_named_color (mts, "snow3", &mts->all_attendees_bg_color);
-	gdk_color_black (colormap, &mts->grid_color);
-	gdk_color_white (colormap, &mts->grid_shadow_color);
+	e_meeting_time_selector_alloc_named_color (mts, "black", &mts->grid_color);
+	e_meeting_time_selector_alloc_named_color (mts, "white", &mts->grid_shadow_color);
 	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->grid_unused_color);
-	gdk_color_white (colormap, &mts->stipple_bg_color);
-	gdk_color_white (colormap, &mts->attendee_list_bg_color);
+	e_meeting_time_selector_alloc_named_color (mts, "white", &mts->stipple_bg_color);
+	e_meeting_time_selector_alloc_named_color (mts, "white", &mts->attendee_list_bg_color);
 
 	e_meeting_time_selector_alloc_named_color (mts, "snow4", &mts->meeting_time_bg_color);
 	e_meeting_time_selector_alloc_named_color (mts, "yellow", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
@@ -866,7 +864,7 @@ e_meeting_time_selector_unrealize (GtkWi
 
 	mts = E_MEETING_TIME_SELECTOR (widget);
 
-	gdk_gc_unref (mts->color_key_gc);
+	g_object_unref (mts->color_key_gc);
 	mts->color_key_gc = NULL;
 
 	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)
@@ -1031,15 +1029,15 @@ e_meeting_time_selector_get_meeting_time
 					  gint *end_hour,
 					  gint *end_minute)
 {
-	*start_year = g_date_year (&mts->meeting_start_time.date);
-	*start_month = g_date_month (&mts->meeting_start_time.date);
-	*start_day = g_date_day (&mts->meeting_start_time.date);
+	*start_year = g_date_get_year (&mts->meeting_start_time.date);
+	*start_month = g_date_get_month (&mts->meeting_start_time.date);
+	*start_day = g_date_get_day (&mts->meeting_start_time.date);
 	*start_hour = mts->meeting_start_time.hour;
 	*start_minute = mts->meeting_start_time.minute;
 
-	*end_year = g_date_year (&mts->meeting_end_time.date);
-	*end_month = g_date_month (&mts->meeting_end_time.date);
-	*end_day = g_date_day (&mts->meeting_end_time.date);
+	*end_year = g_date_get_year (&mts->meeting_end_time.date);
+	*end_month = g_date_get_month (&mts->meeting_end_time.date);
+	*end_day = g_date_get_day (&mts->meeting_end_time.date);
 	*end_hour = mts->meeting_end_time.hour;
 	*end_minute = mts->meeting_end_time.minute;
 }
@@ -1667,7 +1665,7 @@ e_meeting_time_selector_calculate_time_d
 						   gint *hours,
 						   gint *minutes)
 {
-	*days = g_date_julian (&end->date) - g_date_julian (&start->date);
+	*days = g_date_get_julian (&end->date) - g_date_get_julian (&start->date);
 	*hours = end->hour - start->hour;
 	*minutes = end->minute - start->minute;
 	if (*minutes < 0) {
@@ -2188,7 +2186,7 @@ e_meeting_time_selector_on_start_time_ch
 	/* Date */
 	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->start_date_edit));
 	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
+	g_date_set_time_t (&mtstime.date, newtime);
 
 	/* Time */
 	e_date_edit_get_time_of_day (E_DATE_EDIT (mts->start_date_edit), &hour, &minute);
@@ -2234,7 +2232,7 @@ e_meeting_time_selector_on_end_time_chan
 	/* Date */
 	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->end_date_edit));
 	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
+	g_date_set_time_t (&mtstime.date, newtime);
 	if (mts->all_day)
 		g_date_add_days (&mtstime.date, 1);
 
@@ -2649,9 +2647,9 @@ static void
 e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
 {
 	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->start_date_edit),
-					      g_date_year (&mts->meeting_start_time.date),
-					      g_date_month (&mts->meeting_start_time.date),
-					      g_date_day (&mts->meeting_start_time.date),
+					      g_date_get_year (&mts->meeting_start_time.date),
+					      g_date_get_month (&mts->meeting_start_time.date),
+					      g_date_get_day (&mts->meeting_start_time.date),
 					      mts->meeting_start_time.hour,
 					      mts->meeting_start_time.minute);
 }
@@ -2668,9 +2666,9 @@ e_meeting_time_selector_update_end_date_
 		g_date_subtract_days (&date, 1);
 
 	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->end_date_edit),
-					      g_date_year (&date),
-					      g_date_month (&date),
-					      g_date_day (&date),
+					      g_date_get_year (&date),
+					      g_date_get_month (&date),
+					      g_date_get_day (&date),
 					      mts->meeting_end_time.hour,
 					      mts->meeting_end_time.minute);
 }
@@ -2841,7 +2839,7 @@ e_meeting_time_selector_calculate_time_p
 
 	/* Calculate the number of days since the first date shown in the
 	   entire canvas scroll region. */
-	date_offset = g_date_julian (&mtstime->date) - g_date_julian (&mts->first_date_shown);
+	date_offset = g_date_get_julian (&mtstime->date) - g_date_get_julian (&mts->first_date_shown);
 
 	/* Calculate the x pixel coordinate of the start of the day. */
 	x = date_offset * mts->day_width;
Index: calendar/gui/e-week-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-main-item.c,v
retrieving revision 1.26
diff -u -p -r1.26 e-week-view-main-item.c
--- calendar/gui/e-week-view-main-item.c	24 Aug 2006 14:21:20 -0000	1.26
+++ calendar/gui/e-week-view-main-item.c	27 Sep 2006 15:24:00 -0000
@@ -224,8 +224,8 @@ e_week_view_main_item_draw_day (EWeekVie
 
 	g_return_if_fail (gc != NULL);
 
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
+	month = g_date_get_month (date);
+	day_of_month = g_date_get_day (date);
 	line_y = y + E_WEEK_VIEW_DATE_T_PAD +
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
 		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
@@ -341,9 +341,9 @@ e_week_view_main_item_draw_day (EWeekVie
 		/* Check if we are drawing today */		
 		tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
 						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		if (g_date_year (date) == tt.year 
-		    && g_date_month (date) == tt.month
-		    && g_date_day (date) == tt.day) {
+		if (g_date_get_year (date) == tt.year 
+		    && g_date_get_month (date) == tt.month
+		    && g_date_get_day (date) == tt.day) {
 			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
 			today = TRUE;
 		}
@@ -428,8 +428,8 @@ e_week_view_main_item_draw_day (EWeekVie
 
 	g_return_if_fail (gc != NULL);
 
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
+	month = g_date_get_month (date);
+	day_of_month = g_date_get_day (date);
 	line_y = y + E_WEEK_VIEW_DATE_T_PAD +
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
 		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
@@ -556,9 +556,9 @@ e_week_view_main_item_draw_day (EWeekVie
 		/* Check if we are drawing today */		
 		tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
 						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		if (g_date_year (date) == tt.year 
-		    && g_date_month (date) == tt.month
-		    && g_date_day (date) == tt.day) {
+		if (g_date_get_year (date) == tt.year 
+		    && g_date_get_month (date) == tt.month
+		    && g_date_get_day (date) == tt.day) {
 			gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
 			today = TRUE;
 		}
Index: calendar/gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.261
diff -u -p -r1.261 e-week-view.c
--- calendar/gui/e-week-view.c	11 Jul 2006 11:54:45 -0000	1.261
+++ calendar/gui/e-week-view.c	27 Sep 2006 15:24:02 -0000
@@ -250,7 +250,7 @@ time_range_changed_cb (ECalModel *model,
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 
 	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (&date) - 1;
+	weekday = g_date_get_weekday (&date) - 1;
 	
 	/* Convert it to an offset from the start of the display. */
 	week_start_offset = (weekday + 7 - week_view->display_start_day) % 7;
@@ -432,9 +432,9 @@ timezone_changed_cb (ECalendarView *cal_
 
 	/* Recalculate the new start of the first week. We just use exactly
 	   the same time, but with the new timezone. */
-	tt.year = g_date_year (&week_view->first_day_shown);
-	tt.month = g_date_month (&week_view->first_day_shown);
-	tt.day = g_date_day (&week_view->first_day_shown);
+	tt.year = g_date_get_year (&week_view->first_day_shown);
+	tt.month = g_date_get_month (&week_view->first_day_shown);
+	tt.day = g_date_get_day (&week_view->first_day_shown);
 
 	lower = icaltime_as_timet_with_zone (tt, new_zone);
 
@@ -563,7 +563,7 @@ e_week_view_init (EWeekView *week_view)
 	}
 	week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS;
 
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	/*
 	 * Scrollbar.
@@ -714,7 +714,7 @@ e_week_view_unrealize (GtkWidget *widget
 
 	week_view = E_WEEK_VIEW (widget);
 
-	gdk_gc_unref (week_view->main_gc);
+	g_object_unref (week_view->main_gc);
 	week_view->main_gc = NULL;
 
 	colormap = gtk_widget_get_colormap (widget);
@@ -1364,16 +1364,16 @@ e_week_view_set_selected_time_range	(ECa
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 
 	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&week_view->base_date);
+	week_view->selection_start_day = g_date_get_julian (&date)
+		- g_date_get_julian (&week_view->base_date);
 	if (end_time == start_time
 	    || end_time <= time_add_day_with_zone (start_time, 1,
 						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
 		week_view->selection_end_day = week_view->selection_start_day;
 	else {
 		time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&week_view->base_date);
+		week_view->selection_end_day = g_date_get_julian (&end_date)
+			- g_date_get_julian (&week_view->base_date);
 	}
 
 	/* Make sure the selection is valid. */
@@ -1407,16 +1407,16 @@ e_week_view_set_selected_time_range_visi
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 	
 	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&week_view->first_day_shown);
+	week_view->selection_start_day = g_date_get_julian (&date)
+		- g_date_get_julian (&week_view->first_day_shown);
 	if (end_time == start_time
 	    || end_time <= time_add_day_with_zone (start_time, 1,
 						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
 		week_view->selection_end_day = week_view->selection_start_day;
 	else {
 		time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&week_view->first_day_shown);
+		week_view->selection_end_day = g_date_get_julian (&end_date)
+			- g_date_get_julian (&week_view->first_day_shown);
 	}
 
 	/* Make sure the selection is valid. */
@@ -1506,15 +1506,15 @@ e_week_view_set_first_day_shown		(EWeekV
 	/* Calculate the old selection range. */
 	if (week_view->selection_start_day != -1) {
 		old_selection_start_julian =
-			g_date_julian (&week_view->base_date)
+			g_date_get_julian (&week_view->base_date)
 			+ week_view->selection_start_day;
 		old_selection_end_julian =
-			g_date_julian (&week_view->base_date)
+			g_date_get_julian (&week_view->base_date)
 			+ week_view->selection_end_day;
 	}
 
 	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (date) - 1;
+	weekday = g_date_get_weekday (date) - 1;
 
 	/* Convert it to an offset from the start of the display. */
 	day_offset = (weekday + 7 - week_view->display_start_day) % 7;
@@ -1536,9 +1536,9 @@ e_week_view_set_first_day_shown		(EWeekV
 	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
 		week_view->first_day_shown = base_date;
 
-		start_tt.year = g_date_year (&base_date);
-		start_tt.month = g_date_month (&base_date);
-		start_tt.day = g_date_day (&base_date);
+		start_tt.year = g_date_get_year (&base_date);
+		start_tt.month = g_date_get_month (&base_date);
+		start_tt.day = g_date_get_day (&base_date);
 
 		start_time = icaltime_as_timet_with_zone (start_tt,
 							  e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
@@ -1551,9 +1551,9 @@ e_week_view_set_first_day_shown		(EWeekV
 	   just select the first day. */
 	if (week_view->selection_start_day != -1) {
 		week_view->selection_start_day = old_selection_start_julian
-			- g_date_julian (&base_date);
+			- g_date_get_julian (&base_date);
 		week_view->selection_end_day = old_selection_end_julian
-			- g_date_julian (&base_date);
+			- g_date_get_julian (&base_date);
 
 		/* Make sure the selection is valid. */
 		num_days = week_view->multi_week_view
@@ -4129,7 +4129,7 @@ e_week_view_on_jump_button_event (GnomeC
 					       pixbuf, NULL);
 		}
 		if (pixbuf)
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (pixbuf);
 	}
 
 	return FALSE;
Index: calendar/gui/gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.401
diff -u -p -r1.401 gnome-cal.c
--- calendar/gui/gnome-cal.c	28 Aug 2006 05:24:15 -0000	1.401
+++ calendar/gui/gnome-cal.c	27 Sep 2006 15:24:04 -0000
@@ -604,7 +604,7 @@ get_times_for_views (GnomeCalendar *gcal
 		   week start day. */
 
 		/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-		weekday = g_date_weekday (&date) % 7;
+		weekday = g_date_get_weekday (&date) % 7;
 
 		/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */
 		first_day = (E_DAY_VIEW (priv->views[view_type])->week_start_day + 1) % 7;
@@ -641,9 +641,9 @@ get_times_for_views (GnomeCalendar *gcal
 			g_date_subtract_days (&date, offset);
 		}
 
-		tt.year = g_date_year (&date);
-		tt.month = g_date_month (&date);
-		tt.day = g_date_day (&date);
+		tt.year = g_date_get_year (&date);
+		tt.month = g_date_get_month (&date);
+		tt.day = g_date_get_day (&date);
 
 		*start_time = icaltime_as_timet_with_zone (tt, priv->zone);
 		*end_time = time_add_day_with_zone (*start_time, days_shown, priv->zone);
@@ -1342,17 +1342,17 @@ update_adjustment (GnomeCalendar *gcal, 
 	g_date_add_days (&date, week_offset * 7);
 
 	/* Convert the old & new first days shown to julian values. */
-	old_first_day_julian = g_date_julian (&week_view->first_day_shown);
-	new_first_day_julian = g_date_julian (&date);
+	old_first_day_julian = g_date_get_julian (&week_view->first_day_shown);
+	new_first_day_julian = g_date_get_julian (&date);
 
 	/* If we are already showing the date, just return. */
 	if (old_first_day_julian == new_first_day_julian)
 		return;
 
 	/* Convert it to a time_t. */
-	start_tt.year = g_date_year (&date);
-	start_tt.month = g_date_month (&date);
-	start_tt.day = g_date_day (&date);
+	start_tt.year = g_date_get_year (&date);
+	start_tt.month = g_date_get_month (&date);
+	start_tt.day = g_date_get_day (&date);
 
 	lower = icaltime_as_timet_with_zone (start_tt, gcal->priv->zone);
 
@@ -3277,20 +3277,20 @@ gnome_calendar_on_date_navigator_selecti
 	    && !g_date_compare (&end_date, &new_end_date))
 		return;
 	
-	new_days_shown = g_date_julian (&new_end_date) - g_date_julian (&new_start_date) + 1;
+	new_days_shown = g_date_get_julian (&new_end_date) - g_date_get_julian (&new_start_date) + 1;
 
 	/* If a complete week is selected we show the Week view.
 	   Note that if weekends are compressed and the week start day is set
 	   to Sunday we don't actually show complete weeks in the Week view,
 	   so this may need tweaking. */
-	if (g_date_weekday (&new_start_date) % 7 == priv->week_start)
+	if (g_date_get_weekday (&new_start_date) % 7 == priv->week_start)
 		starts_on_week_start_day = TRUE;
 
 	/* Update selection to be in the new time range */
 	tt = icaltime_null_time ();
-	tt.year = g_date_year (&new_start_date);
-	tt.month  = g_date_month (&new_start_date);
-	tt.day = g_date_day (&new_start_date);
+	tt.year = g_date_get_year (&new_start_date);
+	tt.month  = g_date_get_month (&new_start_date);
+	tt.day = g_date_get_day (&new_start_date);
 	new_time = icaltime_as_timet_with_zone (tt, priv->zone);
 	
 	/* Switch views as appropriate, and change the number of days or weeks
Index: calendar/gui/goto.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/goto.c,v
retrieving revision 1.45
diff -u -p -r1.45 goto.c
--- calendar/gui/goto.c	8 Feb 2006 13:06:02 -0000	1.45
+++ calendar/gui/goto.c	27 Sep 2006 15:24:05 -0000
@@ -91,9 +91,9 @@ ecal_event (ECalendarItem *calitem, gpoi
 	
 	e_calendar_item_get_selection (calitem, &start_date, &end_date);
 
-	tt.year = g_date_year (&start_date);
-	tt.month = g_date_month (&start_date);
-	tt.day = g_date_day (&start_date);
+	tt.year = g_date_get_year (&start_date);
+	tt.month = g_date_get_month (&start_date);
+	tt.day = g_date_get_day (&start_date);
 
 	et = icaltime_as_timet_with_zone (tt, gnome_calendar_get_timezone (dlg->gcal));
 
Index: calendar/gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.119
diff -u -p -r1.119 event-page.c
--- calendar/gui/dialogs/event-page.c	22 Aug 2006 11:57:47 -0000	1.119
+++ calendar/gui/dialogs/event-page.c	27 Sep 2006 15:24:08 -0000
@@ -1707,7 +1707,7 @@ existing_attendee (EMeetingAttendee *ia,
 		const char *address;
 		
 		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
+		if (address && !g_ascii_strcasecmp (ia_address, address)) {
 			e_cal_component_free_attendee_list (attendees);
 			return TRUE;
 		}
Index: calendar/gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.89
diff -u -p -r1.89 task-page.c
--- calendar/gui/dialogs/task-page.c	24 Aug 2006 13:53:21 -0000	1.89
+++ calendar/gui/dialogs/task-page.c	27 Sep 2006 15:24:09 -0000
@@ -1013,7 +1013,7 @@ existing_attendee (EMeetingAttendee *ia,
 		const char *address;
 		
 		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
+		if (address && !g_ascii_strcasecmp (ia_address, address)) {
 			e_cal_component_free_attendee_list (attendees);
 			return TRUE;
 		}
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3915
diff -u -p -r1.3915 ChangeLog
--- mail/ChangeLog	18 Sep 2006 17:24:18 -0000	1.3915
+++ mail/ChangeLog	27 Sep 2006 15:24:19 -0000
@@ -1,3 +1,11 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	Fixes bug #357970
+
+	* em-folder-browser.c:
+	* em-folder-view.c:
+	Don't call deprecated GLib / GDK functions.
+
 2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	Fixes #351332
Index: mail/em-folder-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
retrieving revision 1.91
diff -u -p -r1.91 em-folder-browser.c
--- mail/em-folder-browser.c	14 Sep 2006 16:58:53 -0000	1.91
+++ mail/em-folder-browser.c	27 Sep 2006 15:24:20 -0000
@@ -325,13 +325,13 @@ generate_viewoption_menu (GtkWidget *emf
 			GtkImage *image;
 			
 			gdk_color_parse(label->colour, &colour);
-			gdk_color_alloc(gdk_colormap_get_system(), &colour);
+			gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, FALSE, TRUE);
 		
 			pixmap = gdk_pixmap_new(((GtkWidget *)emfv)->window, 16, 16, -1);
 			gc = gdk_gc_new(((GtkWidget *)emfv)->window);
 			gdk_gc_set_foreground(gc, &colour);
 			gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
-			gdk_gc_unref(gc); 
+			g_object_unref(gc); 
 			
 			image = gtk_image_new_from_pixmap(pixmap, NULL); */
 			str = string_without_underscores (label->name);
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.161
diff -u -p -r1.161 em-folder-view.c
--- mail/em-folder-view.c	18 Sep 2006 17:24:45 -0000	1.161
+++ mail/em-folder-view.c	27 Sep 2006 15:24:21 -0000
@@ -1226,13 +1226,13 @@ emfv_popup(EMFolderView *emfv, GdkEvent 
 			item->visible = EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY;
 
 			gdk_color_parse(label->colour, &colour);
-			gdk_color_alloc(gdk_colormap_get_system(), &colour);
+			gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, FALSE, TRUE);
 		
 			pixmap = gdk_pixmap_new(((GtkWidget *)emfv)->window, 16, 16, -1);
 			gc = gdk_gc_new(((GtkWidget *)emfv)->window);
 			gdk_gc_set_foreground(gc, &colour);
 			gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
-			gdk_gc_unref(gc);
+			g_object_unref(gc);
 
 			item->image = gtk_image_new_from_pixmap(pixmap, NULL);
 			gtk_widget_show(item->image);
Index: plugins/exchange-operations/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
retrieving revision 1.122
diff -u -p -r1.122 ChangeLog
--- plugins/exchange-operations/ChangeLog	7 Aug 2006 08:47:25 -0000	1.122
+++ plugins/exchange-operations/ChangeLog	27 Sep 2006 15:24:22 -0000
@@ -1,3 +1,8 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	* exchange-config-listener.c: Don't call deprecated GLib / GDK
+	functions.
+
 2006-08-07  Sushma Rai  <rsushma@novell.com>
 
 	* org-gnome-exchange-operations.error.xml: Corrected a spelling 
Index: plugins/exchange-operations/exchange-config-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-config-listener.c,v
retrieving revision 1.28
diff -u -p -r1.28 exchange-config-listener.c
--- plugins/exchange-operations/exchange-config-listener.c	15 Jun 2006 10:59:05 -0000	1.28
+++ plugins/exchange-operations/exchange-config-listener.c	27 Sep 2006 15:24:23 -0000
@@ -725,7 +725,7 @@ exchange_config_listener_authenticate (E
 		}
 		g_free (title);
 	}
-	else if (remember_password && !g_strcasecmp (remember_password, "false")) {
+	else if (remember_password && !g_ascii_strcasecmp (remember_password, "false")) {
 		/* get_password returns the password cached but user has not
 		 * selected remember password option, forget this password
 		 * whis is stored temporarily by e2k_validate_user(), to avoid
Index: widgets/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.178
diff -u -p -r1.178 ChangeLog
--- widgets/ChangeLog	18 Sep 2006 17:31:22 -0000	1.178
+++ widgets/ChangeLog	27 Sep 2006 15:24:23 -0000
@@ -1,3 +1,10 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	Fixes bug #357970
+
+	* text/e-text.c (e_text_unrealize): Don't call deprecated GLib / GDK
+	functions.
+
 2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #351332
Index: widgets/misc/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.446
diff -u -p -r1.446 ChangeLog
--- widgets/misc/ChangeLog	12 Sep 2006 11:31:32 -0000	1.446
+++ widgets/misc/ChangeLog	27 Sep 2006 15:24:25 -0000
@@ -1,3 +1,16 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	Fixes #357970
+
+	* e-calendar-item.c:
+	* e-canvas-background.c:
+	* e-filter-bar.c:
+	* e-search-bar.c:
+	* gal-combo-box.c:
+	Don't call deprecated GLib / GDK functions.
+
+	* e-colors.c (e_color_alloc): Remove unused function.
+
 2006-09-12  Ushveen Kaur  <kushveen@novell.com>
 
 	** Fix for bug #325614
Index: widgets/misc/e-calendar-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-calendar-item.c,v
retrieving revision 1.52
diff -u -p -r1.52 e-calendar-item.c
--- widgets/misc/e-calendar-item.c	23 Aug 2006 09:23:38 -0000	1.52
+++ widgets/misc/e-calendar-item.c	27 Sep 2006 15:24:27 -0000
@@ -700,11 +700,7 @@ e_calendar_item_unrealize	(GnomeCanvasIt
 
 	colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
 
-	for (i = 0; i < E_CALENDAR_ITEM_COLOR_LAST; i++) {
-		/* FIXME: gdk_colors_free expects gulong* here but the pixel value in GdkColor
-		   is guint32.  GDK bug?  */
-		gdk_colors_free (colormap, (gulong *) &calitem->colors[i].pixel, 1, 0);
-	}
+	gdk_colormap_free_colors (colormap, calitem->colors, E_CALENDAR_ITEM_COLOR_LAST);
 
 	if (GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize)
 		(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize) (item);
Index: widgets/misc/e-canvas-background.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-canvas-background.c,v
retrieving revision 1.16
diff -u -p -r1.16 e-canvas-background.c
--- widgets/misc/e-canvas-background.c	18 Sep 2006 13:06:16 -0000	1.16
+++ widgets/misc/e-canvas-background.c	27 Sep 2006 15:24:27 -0000
@@ -358,7 +358,7 @@ ecb_unrealize (GnomeCanvasItem *item)
 {
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
 
-	gdk_gc_unref (ecb->priv->gc);
+	g_object_unref (ecb->priv->gc);
 	ecb->priv->gc = NULL;
 
 	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
Index: widgets/misc/e-colors.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-colors.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-colors.c
--- widgets/misc/e-colors.c	29 Apr 2005 14:18:18 -0000	1.15
+++ widgets/misc/e-colors.c	27 Sep 2006 15:24:27 -0000
@@ -33,19 +33,6 @@
 
 GdkColor e_white, e_dark_gray, e_black;
 
-gulong
-e_color_alloc (gushort red, gushort green, gushort blue)
-{
-	e_color_init ();
-
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-	return gdk_rgb_xpixel_from_rgb (
-		((red & 0xff) << 16) | ((green & 0xff) << 8) |
-		(blue & 0xff));
-}
-
 void
 e_color_alloc_gdk (GtkWidget *widget, GdkColor *c)
 {
Index: widgets/misc/e-filter-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-filter-bar.c,v
retrieving revision 1.57
diff -u -p -r1.57 e-filter-bar.c
--- widgets/misc/e-filter-bar.c	21 Aug 2006 05:57:39 -0000	1.57
+++ widgets/misc/e-filter-bar.c	27 Sep 2006 15:24:28 -0000
@@ -556,7 +556,7 @@ get_property (GObject *object, guint pro
 			GString *out = g_string_new ("");
 			
 			filter_rule_build_code (efb->current_query, out);
-			g_value_set_string_take_ownership (value, out->str);
+			g_value_take_string (value, out->str);
 			g_string_free (out, FALSE);
 		} else {
 			g_value_set_string (value, NULL);
@@ -602,7 +602,7 @@ get_property (GObject *object, guint pro
 		text[n] = '\0';
 		xmlFree (xmlbuf);
 		
-		g_value_set_string_take_ownership (value, text);
+		g_value_take_string (value, text);
 		
 		break; }
 	default:
Index: widgets/misc/e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.109
diff -u -p -r1.109 e-search-bar.c
--- widgets/misc/e-search-bar.c	28 Aug 2006 06:53:55 -0000	1.109
+++ widgets/misc/e-search-bar.c	27 Sep 2006 15:24:29 -0000
@@ -745,7 +745,7 @@ impl_get_property (GObject *object, guin
 		break;
 
 	case PROP_TEXT:
-		g_value_set_string_take_ownership (value, e_search_bar_get_text (esb));
+		g_value_take_string (value, e_search_bar_get_text (esb));
 		break;
 
 	default:
Index: widgets/misc/gal-combo-box.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/gal-combo-box.c,v
retrieving revision 1.6
diff -u -p -r1.6 gal-combo-box.c
--- widgets/misc/gal-combo-box.c	18 Sep 2006 13:06:17 -0000	1.6
+++ widgets/misc/gal-combo-box.c	27 Sep 2006 15:24:29 -0000
@@ -610,7 +610,7 @@ gtk_combo_tearoff_bg_copy (GalComboBox *
 		gdk_draw_drawable (GDK_DRAWABLE (pixmap), gc,
 				 widget->window,
 				 0, 0, 0, 0, -1, -1);
-		gdk_gc_unref (gc);
+		g_object_unref (gc);
       
 		gtk_widget_set_usize (combo->priv->tearoff_window,
 				      widget->allocation.width,
Index: widgets/table/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/ChangeLog,v
retrieving revision 1.36
diff -u -p -r1.36 ChangeLog
--- widgets/table/ChangeLog	24 Aug 2006 01:07:50 -0000	1.36
+++ widgets/table/ChangeLog	27 Sep 2006 15:24:36 -0000
@@ -1,3 +1,20 @@
+2006-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	Fixes bug #357970
+
+	* e-cell-pixbuf.c:
+	* e-cell-progress.c:
+	* e-cell-text.c:
+	* e-cell-toggle.c:
+	* e-cell-tree.c:
+	* e-table-col.c:
+	* e-table-extras.c:
+	* e-table-header-item.c:
+	* e-table-header-utils.c:
+	* e-table-item.c:
+	* e-table-memory-store.c:
+	Don't call deprecated GLib / GDK functions.
+
 2006-08-24  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	** Fixes bug #337582
Index: widgets/table/e-cell-pixbuf.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-pixbuf.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-cell-pixbuf.c
--- widgets/table/e-cell-pixbuf.c	17 Jun 2005 15:20:34 -0000	1.15
+++ widgets/table/e-cell-pixbuf.c	27 Sep 2006 15:24:37 -0000
@@ -180,15 +180,14 @@ pixbuf_draw (ECellView *ecell_view, GdkD
     }
 
 
-    gdk_pixbuf_render_to_drawable_alpha (cell_pixbuf,
-					 drawable,
-					 0, 0,
-					 real_x, real_y, 
-					 real_w, real_h,
-					 GDK_PIXBUF_ALPHA_FULL,
-					 127,
-					 GDK_RGB_DITHER_NORMAL,
-					 0, 0);
+    gdk_draw_pixbuf (drawable,
+		     NULL,
+		     cell_pixbuf,
+		     0, 0,
+		     real_x, real_y,
+		     real_w, real_h,
+		     GDK_RGB_DITHER_NORMAL,
+		     0, 0);
 }
 
 static gint
Index: widgets/table/e-cell-progress.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-progress.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-cell-progress.c
--- widgets/table/e-cell-progress.c	30 Jan 2006 12:28:20 -0000	1.7
+++ widgets/table/e-cell-progress.c	27 Sep 2006 15:24:37 -0000
@@ -97,7 +97,7 @@ eprog_unrealize (ECellView *ecv)
 {
 	ECellProgressView *progress_view = (ECellProgressView *) ecv;
 
-	gdk_gc_unref (progress_view->gc);
+	g_object_unref (progress_view->gc);
 	progress_view->gc = NULL;
 }
 
@@ -200,14 +200,14 @@ eprog_draw (ECellView *ecell_view, GdkDr
 
 	eprog_draw_bar(progress, progress->red, progress->green, progress->blue, value);
 
-	gdk_pixbuf_render_to_drawable_alpha (progress->image, drawable,
-					     0, 0,
-					     x, y,
-					     progress->width, progress->height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     128,
-					     GDK_RGB_DITHER_NORMAL,
-					     x, y);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 progress->image,
+			 0, 0,
+			 x, y,
+			 progress->width, progress->height,
+			 GDK_RGB_DITHER_NORMAL,
+			 x, y);
 }
 
 static void
@@ -285,7 +285,7 @@ eprog_dispose (GObject *object)
 {
 	ECellProgress *eprog = E_CELL_PROGRESS (object);
 	
-	gdk_pixbuf_unref (eprog->image);
+	g_object_unref (eprog->image);
 	g_free (eprog->image);
 	g_free (eprog->buffer);
 
Index: widgets/table/e-cell-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-text.c,v
retrieving revision 1.154
diff -u -p -r1.154 e-cell-text.c
--- widgets/table/e-cell-text.c	18 Sep 2006 13:06:22 -0000	1.154
+++ widgets/table/e-cell-text.c	27 Sep 2006 15:24:38 -0000
@@ -406,7 +406,7 @@ ect_unrealize (ECellView *ecv)
 	ECellText *ect = (ECellText*) ecv->ecell;
 	GdkColormap *colormap;
 
-	gdk_gc_unref (text_view->gc);
+	g_object_unref (text_view->gc);
 	text_view->gc = NULL;
 
 	if (text_view->edit){
@@ -441,7 +441,7 @@ ect_free_color (gchar *color_spec, GdkCo
 	if (color != (GdkColor*) 1) {
 		gulong pix = color->pixel;
 
-		gdk_colors_free (colormap, &pix, 1, 0);
+		gdk_colormap_free_colors (colormap, color, 1);
 
 		/* This frees the memory for the GdkColor. */
 		gdk_color_free (color);
@@ -2603,7 +2603,7 @@ e_cell_text_get_color (ECellTextView *ce
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (cell_view->canvas));
 
 		/* Try to allocate the color. */
-		if (gdk_color_alloc (colormap, &tmp_color))
+		if (gdk_colormap_alloc_color (colormap, &tmp_color, FALSE, TRUE))
 			color = gdk_color_copy (&tmp_color);
 	}
 
Index: widgets/table/e-cell-toggle.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-toggle.c,v
retrieving revision 1.46
diff -u -p -r1.46 e-cell-toggle.c
--- widgets/table/e-cell-toggle.c	18 Sep 2006 13:06:25 -0000	1.46
+++ widgets/table/e-cell-toggle.c	27 Sep 2006 15:24:39 -0000
@@ -118,7 +118,7 @@ etog_unrealize (ECellView *ecv)
 {
 	ECellToggleView *toggle_view = (ECellToggleView *) ecv;
 
-	gdk_gc_unref (toggle_view->gc);
+	g_object_unref (toggle_view->gc);
 	toggle_view->gc = NULL;
 }
 
@@ -169,14 +169,15 @@ check_cache (ECellToggleView *toggle_vie
 							  1,
 							  RGB_COLOR (color), RGB_COLOR (color));
 
-		gdk_pixbuf_render_to_drawable (flat, PIXMAP_CACHE (toggle_view, cache_seq, image_seq),
-					       toggle_view->gc,
-					       0, 0,
-					       0, 0,
-					       width, height,
-					       GDK_RGB_DITHER_NORMAL,
-					       0, 0);
-		gdk_pixbuf_unref (flat);
+		gdk_draw_pixbuf (PIXMAP_CACHE (toggle_view, cache_seq, image_seq),
+				 toggle_view->gc,
+				 flat,
+				 0, 0,
+				 0, 0,
+				 width, height,
+				 GDK_RGB_DITHER_NORMAL,
+				 0, 0);
+		g_object_unref (flat);
 	}
 }
 
@@ -382,7 +383,7 @@ etog_finalize (GObject *object)
 	int i;
 	
 	for (i = 0; i < etog->n_states; i++)
-		gdk_pixbuf_unref (etog->images [i]);
+		g_object_unref (etog->images [i]);
 
 	g_free (etog->images);
 
@@ -451,7 +452,7 @@ e_cell_toggle_construct (ECellToggle *et
 
 	for (i = 0; i < n_states; i++){
 		etog->images [i] = images [i];
-		gdk_pixbuf_ref (images [i]);
+		g_object_ref (images [i]);
 
 		if (gdk_pixbuf_get_height (images [i]) > max_height)
 			max_height = gdk_pixbuf_get_height (images [i]);
Index: widgets/table/e-cell-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-tree.c,v
retrieving revision 1.54
diff -u -p -r1.54 e-cell-tree.c
--- widgets/table/e-cell-tree.c	2 Jun 2006 18:12:08 -0000	1.54
+++ widgets/table/e-cell-tree.c	27 Sep 2006 15:24:39 -0000
@@ -190,7 +190,7 @@ ect_unrealize (ECellView *ecv)
 	/* unrealize our subcell view. */
 	e_cell_unrealize (tree_view->subcell_view);
 
-	gdk_gc_unref (tree_view->gc);
+	g_object_unref (tree_view->gc);
 	tree_view->gc = NULL;
 
 	if (parent_class->unrealize)
@@ -209,16 +209,15 @@ draw_retro_expander (ECellTreeView *ectv
 	image_width = gdk_pixbuf_get_width(image);
 	image_height = gdk_pixbuf_get_height(image);
 
-	gdk_pixbuf_render_to_drawable_alpha (image,
-					     drawable,
-					     rect->x, rect->y,
-					     rect->width - image_width / 2, 
-					     rect->height - image_height / 2,
-					     image_width, image_height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     128,
-					     GDK_RGB_DITHER_NORMAL,
-					     image_width, 0);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 image,
+			 rect->x, rect->y,
+			 rect->width - image_width / 2, 
+			 rect->height - image_height / 2,
+			 image_width, image_height,
+			 GDK_RGB_DITHER_NORMAL,
+			 image_width, 0);
 }
 
 static void
@@ -358,16 +357,15 @@ ect_draw (ECellView *ecell_view, GdkDraw
 		}
 
 		if (node_image) {
-			gdk_pixbuf_render_to_drawable_alpha (node_image,
-							     drawable,
-							     0, 0,
-							     x1 + subcell_offset,
-							     y1 + (y2 - y1) / 2 - node_image_height / 2,
-							     node_image_width, node_image_height,
-							     GDK_PIXBUF_ALPHA_BILEVEL,
-							     128,
-							     GDK_RGB_DITHER_NORMAL,
-							     node_image_width, 0);
+			gdk_draw_pixbuf (drawable,
+					 NULL,
+					 node_image,
+					 0, 0,
+					 x1 + subcell_offset,
+					 y1 + (y2 - y1) / 2 - node_image_height / 2,
+					 node_image_width, node_image_height,
+					 GDK_RGB_DITHER_NORMAL,
+					 node_image_width, 0);
 			subcell_offset += node_image_width;
 		}
 	}
@@ -808,11 +806,11 @@ ect_dispose (GObject *object)
 	ect->subcell = NULL;
 
 	if (ect->open_pixbuf)
-		gdk_pixbuf_unref (ect->open_pixbuf);
+		g_object_unref (ect->open_pixbuf);
 	ect->open_pixbuf = NULL;
 
 	if (ect->closed_pixbuf)
-		gdk_pixbuf_unref (ect->closed_pixbuf);
+		g_object_unref (ect->closed_pixbuf);
 	ect->closed_pixbuf = NULL;
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
Index: widgets/table/e-table-col.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-col.c,v
retrieving revision 1.38
diff -u -p -r1.38 e-table-col.c
--- widgets/table/e-table-col.c	17 Jun 2005 15:20:34 -0000	1.38
+++ widgets/table/e-table-col.c	27 Sep 2006 15:24:39 -0000
@@ -45,7 +45,7 @@ etc_dispose (GObject *object)
 	etc->ecell = NULL;
 
 	if (etc->pixbuf)
-		gdk_pixbuf_unref (etc->pixbuf);
+		g_object_unref (etc->pixbuf);
 	etc->pixbuf = NULL;
 
 	if (etc->text)
@@ -232,7 +232,7 @@ e_table_col_new_with_pixbuf (int col_idx
 	etc->resizable = resizable;
 
 	g_object_ref (etc->ecell);
-	gdk_pixbuf_ref (etc->pixbuf);
+	g_object_ref (etc->pixbuf);
 
 	return etc;
 }
Index: widgets/table/e-table-extras.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-extras.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-table-extras.c
--- widgets/table/e-table-extras.c	10 Dec 2005 07:32:03 -0000	1.22
+++ widgets/table/e-table-extras.c	27 Sep 2006 15:24:39 -0000
@@ -58,7 +58,7 @@ pixbuf_hash_free(gchar	*key,
 {
 	g_free(key);
 	if (pixbuf)
-		gdk_pixbuf_unref(pixbuf);
+		g_object_unref(pixbuf);
 }
 
 static void
@@ -281,11 +281,11 @@ e_table_extras_add_pixbuf     (ETableExt
 		g_hash_table_remove (extras->cells, old_key);
 		g_free (old_key);
 		if (old_pixbuf)
-			gdk_pixbuf_unref (old_pixbuf);
+			g_object_unref (old_pixbuf);
 	}
 
 	if (pixbuf)
-		gdk_pixbuf_ref(pixbuf);
+		g_object_ref(pixbuf);
 	g_hash_table_insert (extras->pixbufs, g_strdup(id), pixbuf);
 }
 
Index: widgets/table/e-table-header-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-item.c,v
retrieving revision 1.137
diff -u -p -r1.137 e-table-header-item.c
--- widgets/table/e-table-header-item.c	18 Sep 2006 13:06:26 -0000	1.137
+++ widgets/table/e-table-header-item.c	27 Sep 2006 15:24:40 -0000
@@ -489,7 +489,7 @@ make_shaped_window_from_xpm (const char 
 	
 	pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 	win = gtk_window_new (GTK_WINDOW_POPUP);
Index: widgets/table/e-table-header-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-utils.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-table-header-utils.c
--- widgets/table/e-table-header-utils.c	18 Sep 2006 13:06:26 -0000	1.24
+++ widgets/table/e-table-header-utils.c	27 Sep 2006 15:24:40 -0000
@@ -187,7 +187,7 @@ make_composite_pixmap (GdkDrawable *draw
 
 		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
 		if (!tmp) {
-			gdk_pixbuf_unref (fade);
+			g_object_unref (fade);
 			return NULL;
 		}
 
@@ -202,7 +202,7 @@ make_composite_pixmap (GdkDrawable *draw
 					    16,
 					    color, color);
 
-		gdk_pixbuf_unref (fade);
+		g_object_unref (fade);
 	}
 
 	pixmap = gdk_pixmap_new (drawable, width, height, gdk_rgb_get_visual ()->depth);
@@ -213,7 +213,7 @@ make_composite_pixmap (GdkDrawable *draw
 				      gdk_pixbuf_get_pixels (tmp),
 				      gdk_pixbuf_get_rowstride (tmp),
 				      dither_xofs, dither_yofs);
-	gdk_pixbuf_unref (tmp);
+	g_object_unref (tmp);
 
 	return pixmap;
 }
Index: widgets/table/e-table-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-item.c,v
retrieving revision 1.248
diff -u -p -r1.248 e-table-item.c
--- widgets/table/e-table-item.c	18 Sep 2006 13:06:26 -0000	1.248
+++ widgets/table/e-table-item.c	27 Sep 2006 15:24:43 -0000
@@ -1787,11 +1787,11 @@ eti_unrealize (GnomeCanvasItem *item)
 		}
 	}
 
-	gdk_gc_unref (eti->fill_gc);
+	g_object_unref (eti->fill_gc);
 	eti->fill_gc = NULL;
-	gdk_gc_unref (eti->grid_gc);
+	g_object_unref (eti->grid_gc);
 	eti->grid_gc = NULL;
-	gdk_gc_unref (eti->focus_gc);
+	g_object_unref (eti->focus_gc);
 	eti->focus_gc = NULL;
 	g_object_unref (eti->stipple);
 	eti->stipple = NULL;
Index: widgets/table/e-table-memory-store.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-memory-store.c,v
retrieving revision 1.16
diff -u -p -r1.16 e-table-memory-store.c
--- widgets/table/e-table-memory-store.c	17 Jun 2005 15:20:34 -0000	1.16
+++ widgets/table/e-table-memory-store.c	27 Sep 2006 15:24:43 -0000
@@ -47,7 +47,7 @@ duplicate_value (ETableMemoryStore *etms
 		return g_strdup (val);
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
 		if (val)
-			gdk_pixbuf_ref ((void *) val);
+			g_object_ref ((void *) val);
 		return (void *) val;
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_OBJECT:
 		if (val)
@@ -72,7 +72,7 @@ free_value (ETableMemoryStore *etms, int
 		break;
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
 		if (value)
-			gdk_pixbuf_unref (value);
+			g_object_unref (value);
 		break;
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_OBJECT:
 		if (value)
Index: widgets/text/e-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/text/e-text.c,v
retrieving revision 1.174
diff -u -p -r1.174 e-text.c
--- widgets/text/e-text.c	18 Sep 2006 13:06:49 -0000	1.174
+++ widgets/text/e-text.c	27 Sep 2006 15:24:45 -0000
@@ -1260,7 +1260,7 @@ e_text_unrealize (GnomeCanvasItem *item)
 
 	text = E_TEXT (item);
 
-	gdk_gc_unref (text->gc);
+	g_object_unref (text->gc);
 	text->gc = NULL;
 
 	gdk_cursor_unref (text->i_cursor);
