Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.3111
diff -u -p -r1.3111 ChangeLog
--- calendar/ChangeLog	23 Aug 2006 11:09:04 -0000	1.3111
+++ calendar/ChangeLog	23 Aug 2006 16:35:49 -0000
@@ -1,3 +1,16 @@
+2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #352450
+
+	* gui/calendar-commands.c:
+	* gui/e-day-view-main-item.c:
+	* gui/e-day-view-top-item.c:
+	* gui/e-meeting-list-view.c:
+	* gui/e-meeting-time-sel-item.c:
+	* gui/e-meeting-time-sel.c:
+	* gui/e-week-view-event-item.c:
+	Replace deprecated GLib and GDK function calls.
+
 2006-08-23  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #341691
Index: calendar/gui/calendar-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-commands.c,v
retrieving revision 1.163
diff -u -p -r1.163 calendar-commands.c
--- calendar/gui/calendar-commands.c	30 Jan 2006 04:27:10 -0000	1.163
+++ calendar/gui/calendar-commands.c	23 Aug 2006 16:35:50 -0000
@@ -154,7 +154,7 @@ set_clock_cursor (GnomeCalendar *gcal)
 
 	cursor = gdk_cursor_new (GDK_WATCH);
 	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
-	gdk_cursor_destroy (cursor);
+	gdk_cursor_unref (cursor);
 	gdk_flush ();
 }
 
Index: calendar/gui/e-day-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-main-item.c,v
retrieving revision 1.53
diff -u -p -r1.53 e-day-view-main-item.c
--- calendar/gui/e-day-view-main-item.c	28 Jul 2006 05:46:43 -0000	1.53
+++ calendar/gui/e-day-view-main-item.c	23 Aug 2006 16:35:52 -0000
@@ -795,7 +795,7 @@ e_day_view_main_item_draw_day_event (EDa
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -803,9 +803,9 @@ e_day_view_main_item_draw_day_event (EDa
 					 MIN (E_DAY_VIEW_ICON_HEIGHT,
 					      max_icon_h));
 
-			gdk_pixmap_unref (pixmap);
+			g_object_unref (pixmap);
 			if (mask != NULL)
-				gdk_bitmap_unref (mask);
+				g_object_unref (mask);
 
 			icon_x += icon_x_inc;
 			icon_y += icon_y_inc;
@@ -1930,7 +1930,7 @@ e_day_view_main_item_draw_day_event (EDa
 				gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 				if (mask != NULL)
 					gdk_gc_set_clip_mask (gc, mask);
-				gdk_draw_pixmap (drawable, gc,
+				gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 MIN (E_DAY_VIEW_ICON_WIDTH,
@@ -1938,9 +1938,9 @@ e_day_view_main_item_draw_day_event (EDa
 					 MIN (E_DAY_VIEW_ICON_HEIGHT,
 					      max_icon_h));
 
-				gdk_pixmap_unref (pixmap);
+				g_object_unref (pixmap);
 				if (mask != NULL)
-					gdk_bitmap_unref (mask);
+					g_object_unref (mask);
 
 				icon_x += icon_x_inc;
 				icon_y += icon_y_inc;
Index: calendar/gui/e-day-view-top-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-top-item.c,v
retrieving revision 1.48
diff -u -p -r1.48 e-day-view-top-item.c
--- calendar/gui/e-day-view-top-item.c	4 May 2006 15:14:24 -0000	1.48
+++ calendar/gui/e-day-view-top-item.c	23 Aug 2006 16:35:53 -0000
@@ -572,7 +572,7 @@ e_day_view_top_item_draw_long_event (EDa
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_DAY_VIEW_ICON_WIDTH,
@@ -580,9 +580,9 @@ e_day_view_top_item_draw_long_event (EDa
 			icon_x -= icon_x_inc;
 		}
 
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	e_cal_component_free_categories_list (categories_list);
@@ -1158,7 +1158,7 @@ e_day_view_top_item_draw_long_event (EDa
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_DAY_VIEW_ICON_WIDTH,
@@ -1166,9 +1166,9 @@ e_day_view_top_item_draw_long_event (EDa
 			icon_x -= icon_x_inc;
 		}
 
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	e_cal_component_free_categories_list (categories_list);
Index: calendar/gui/e-meeting-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-list-view.c,v
retrieving revision 1.31
diff -u -p -r1.31 e-meeting-list-view.c
--- calendar/gui/e-meeting-list-view.c	6 Apr 2006 09:25:04 -0000	1.31
+++ calendar/gui/e-meeting-list-view.c	23 Aug 2006 16:35:53 -0000
@@ -786,7 +786,7 @@ process_section (EMeetingListView *view,
 					g_slist_free (*la);
 					*la = NULL;
 				} else
-					*la = g_slist_remove_link (*la, g_slist_find_custom (*la, attendee, (GCompareFunc)g_strcasecmp));
+					*la = g_slist_remove_link (*la, g_slist_find_custom (*la, attendee, (GCompareFunc)g_ascii_strcasecmp));
 			}
 		}
 
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.18
diff -u -p -r1.18 e-meeting-time-sel-item.c
--- calendar/gui/e-meeting-time-sel-item.c	20 Jul 2006 07:18:13 -0000	1.18
+++ calendar/gui/e-meeting-time-sel-item.c	23 Aug 2006 16:35:54 -0000
@@ -159,15 +159,15 @@ e_meeting_time_selector_item_destroy (Gt
 	mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);
 
 	if (mts_item->normal_cursor) {
-		gdk_cursor_destroy (mts_item->normal_cursor);
+		gdk_cursor_unref (mts_item->normal_cursor);
 		mts_item->normal_cursor = NULL;
 	}
 	if (mts_item->resize_cursor) {
-		gdk_cursor_destroy (mts_item->resize_cursor);
+		gdk_cursor_unref (mts_item->resize_cursor);
 		mts_item->resize_cursor = NULL;
 	}
 	if (mts_item->busy_cursor) {
-		gdk_cursor_destroy (mts_item->busy_cursor);
+		gdk_cursor_unref (mts_item->busy_cursor);
 		mts_item->busy_cursor = NULL;
 	}
 
Index: calendar/gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.77
diff -u -p -r1.77 e-meeting-time-sel.c
--- calendar/gui/e-meeting-time-sel.c	20 Jul 2006 07:18:13 -0000	1.77
+++ calendar/gui/e-meeting-time-sel.c	23 Aug 2006 16:35:58 -0000
@@ -822,7 +822,7 @@ e_meeting_time_selector_destroy (GtkObje
 	e_meeting_time_selector_remove_timeout (mts);
 	
 	if (mts->stipple) {
-		gdk_bitmap_unref (mts->stipple);
+		g_object_unref (mts->stipple);
 		mts->stipple = NULL;
 	}
 	
Index: calendar/gui/e-week-view-event-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-event-item.c,v
retrieving revision 1.59
diff -u -p -r1.59 e-week-view-event-item.c
--- calendar/gui/e-week-view-event-item.c	17 Aug 2006 19:45:50 -0000	1.59
+++ calendar/gui/e-week-view-event-item.c	23 Aug 2006 16:35:58 -0000
@@ -704,16 +704,16 @@ e_week_view_event_item_draw_icons (EWeek
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_WEEK_VIEW_ICON_WIDTH,
 					 E_WEEK_VIEW_ICON_HEIGHT);
 			icon_x += icon_x_inc;
 		}
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	e_cal_component_free_categories_list (categories_list);
@@ -1388,16 +1388,16 @@ e_week_view_event_item_draw_icons (EWeek
 			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
 			if (mask != NULL)
 				gdk_gc_set_clip_mask (gc, mask);
-			gdk_draw_pixmap (drawable, gc,
+			gdk_draw_drawable (drawable, gc,
 					 pixmap,
 					 0, 0, icon_x, icon_y,
 					 E_WEEK_VIEW_ICON_WIDTH,
 					 E_WEEK_VIEW_ICON_HEIGHT);
 			icon_x += icon_x_inc;
 		}
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 		if (mask != NULL)
-			gdk_bitmap_unref (mask);
+			g_object_unref (mask);
 	}
 
 	cairo_destroy (cr);
Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.600
diff -u -p -r1.600 ChangeLog
--- e-util/ChangeLog	20 Aug 2006 14:30:42 -0000	1.600
+++ e-util/ChangeLog	23 Aug 2006 16:36:00 -0000
@@ -1,3 +1,10 @@
+2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #352450
+
+	* e-cursor.c:
+	Replace deprecated GDK function call.
+
 2006-08-20  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #349310. Patch from both Laurent Goujon
Index: e-util/e-cursor.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-cursor.c,v
retrieving revision 1.1
diff -u -p -r1.1 e-cursor.c
--- e-util/e-cursor.c	8 Jun 2005 11:46:48 -0000	1.1
+++ e-util/e-cursor.c	23 Aug 2006 16:36:00 -0000
@@ -61,7 +61,7 @@ void e_cursor_set (GtkWidget *widget, EC
 		}
 
 		gdk_window_set_cursor (toplevel->window, window_cursor);
-		gdk_cursor_destroy (window_cursor);
+		gdk_cursor_unref (window_cursor);
 	}
 
 }
Index: widgets/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/ChangeLog,v
retrieving revision 1.176
diff -u -p -r1.176 ChangeLog
--- widgets/ChangeLog	20 Aug 2006 11:50:15 -0000	1.176
+++ widgets/ChangeLog	23 Aug 2006 16:36:16 -0000
@@ -1,3 +1,27 @@
+2006-08-23  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #352450
+
+	* misc/e-canvas-background.c:
+	* misc/e-cursors.c:
+	* misc/e-map.c:
+	* misc/e-reflow.c:
+	* misc/e-task-widget.c:
+	* misc/gal-combo-box.c:
+	* table/e-cell-text.c:
+	* table/e-cell-toggle.c:
+	* table/e-table-field-chooser-item.c:
+	* table/e-table-field-chooser.c:
+	* table/e-table-header-item.c:
+	* table/e-table-header-utils.c:
+	* table/e-table-item.c:
+	* table/e-table.c:
+	* table/e-tree-memory.c:
+	* table/e-tree-sorted.c:
+	* table/e-tree.c:
+	* table/e-text.c:
+	Replace deprecated GLib and GDK function calls.
+
 2006-08-20  Jeff Cai  <jeff.cai@sun.com>
 
 	* e-timezone-dialog/e-timezone-dialog.c:
Index: widgets/misc/e-canvas-background.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-canvas-background.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-canvas-background.c
--- widgets/misc/e-canvas-background.c	30 Jan 2006 12:28:04 -0000	1.15
+++ widgets/misc/e-canvas-background.c	23 Aug 2006 16:36:16 -0000
@@ -161,11 +161,11 @@ set_stipple (ECanvasBackground *ecb, Gdk
 {
 	if (use_value) {
 		if (ecb->priv->stipple)
-			gdk_bitmap_unref (ecb->priv->stipple);
+			g_object_unref (ecb->priv->stipple);
 
 		ecb->priv->stipple = stipple;
 		if (stipple)
-			gdk_bitmap_ref (stipple);
+			g_object_ref (stipple);
 	}
 
 	if (ecb->priv->gc) {
@@ -184,7 +184,7 @@ ecb_dispose (GObject *object)
 
 	if (ecb->priv) {
 		if (ecb->priv->stipple)
-			gdk_bitmap_unref (ecb->priv->stipple);
+			g_object_unref (ecb->priv->stipple);
 		ecb->priv->stipple = NULL;
 
 		g_free (ecb->priv);
Index: widgets/misc/e-cursors.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-cursors.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-cursors.c
--- widgets/misc/e-cursors.c	29 Apr 2005 14:18:18 -0000	1.17
+++ widgets/misc/e-cursors.c	23 Aug 2006 16:36:17 -0000
@@ -143,7 +143,7 @@ e_cursors_shutdown (void)
 	int i;
 
 	for (i = 0; cursors [i].hot_x; i++)
-		gdk_cursor_destroy (cursors [i].cursor);
+		gdk_cursor_unref (cursors [i].cursor);
 }
 
 
Index: widgets/misc/e-map.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-map.c,v
retrieving revision 1.10
diff -u -p -r1.10 e-map.c
--- widgets/misc/e-map.c	7 Jun 2006 16:11:11 -0000	1.10
+++ widgets/misc/e-map.c	23 Aug 2006 16:36:17 -0000
@@ -319,7 +319,7 @@ e_map_realize (GtkWidget *widget)
 	attr.height = widget->allocation.height;
 	attr.wclass = GDK_INPUT_OUTPUT;
 	attr.visual = gdk_rgb_get_visual ();
-	attr.colormap = gdk_rgb_get_cmap ();
+	attr.colormap = gdk_rgb_get_colormap ();
 	attr.event_mask = gtk_widget_get_events (widget) |
 	  GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK |
 	  GDK_POINTER_MOTION_MASK;
@@ -1277,9 +1277,9 @@ scroll_to (EMap *view, int x, int y)
 	gc = gdk_gc_new (window);
 	gdk_gc_set_exposures (gc, TRUE);
 
-	gdk_window_copy_area (window, gc, dest_x, dest_y, window, src_x, src_y, width - abs (xofs), height - abs (yofs));
+	gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), src_x, src_y, dest_x, dest_y, width - abs (xofs), height - abs (yofs));
 
-	gdk_gc_destroy (gc);
+	g_object_unref (gc);
 
 	/* Add the scrolled-in region */
 
@@ -1429,7 +1429,7 @@ blowup_window_area (GdkWindow *window, g
 
 	/* Get area constraints */
 
-	gdk_window_get_size (window, &area_width, &area_height);
+	gdk_drawable_get_size (GDK_DRAWABLE (window), &area_width, &area_height);
 
 	/* Initialize area division array indexes */
 
@@ -1487,9 +1487,9 @@ blowup_window_area (GdkWindow *window, g
 				/* Push left */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, line + j + 1, 0, window, line, 0, 1, area_height);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line, 0, line + j + 1, 0, 1, area_height);
 
-				gdk_window_copy_area (window, gc, 0, 0, window, zoom_chunk, 0, line, area_height);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), zoom_chunk, 0, 0, 0, line, area_height);
 				if (line > target_x) target_x -= zoom_chunk;
 			}
 			else
@@ -1497,9 +1497,9 @@ blowup_window_area (GdkWindow *window, g
 				/* Push right */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, line + j - (zoom_chunk - 1), 0, window, line - zoom_chunk, 0, 1, area_height);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line + j - (zoom_chunk - 1), 0, 1, area_height);
 
-				gdk_window_copy_area (window, gc, line, 0, window, line - zoom_chunk, 0, area_width - line, area_height);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), line - zoom_chunk, 0, line, 0, area_width - line, area_height);
 				if (line < target_x) target_x += zoom_chunk;
 			}
 		}
@@ -1515,9 +1515,9 @@ blowup_window_area (GdkWindow *window, g
 				/* Push up */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, 0, line + j + 1, window, 0, line, area_width, 1);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line, 0, line + j + 1, area_width, 1);
 
-				gdk_window_copy_area (window, gc, 0, 0, window, 0, zoom_chunk, area_width, line);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, zoom_chunk, 0, 0, area_width, line);
 				if (line > target_y) target_y -= zoom_chunk;
 			}
 			else
@@ -1525,9 +1525,9 @@ blowup_window_area (GdkWindow *window, g
 				/* Push down */
 
 				for (j = 0; j < zoom_chunk - 1; j++)
-					gdk_window_copy_area (window, gc, 0, line + j - (zoom_chunk - 1), window, 0, line - zoom_chunk, area_width, 1);
+					gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_WINDOW (window), 0, line - zoom_chunk, 0, line + j - (zoom_chunk - 1), area_width, 1);
 
-				gdk_window_copy_area (window, gc, 0, line, window, 0, line - zoom_chunk, area_width, area_height - line);
+				gdk_draw_drawable (GDK_DRAWABLE (window), gc, GDK_DRAWABLE (window), 0, line - zoom_chunk, 0, line, area_width, area_height - line);
 				if (line < target_y) target_y += zoom_chunk;
 			}
 		}
@@ -1540,7 +1540,7 @@ blowup_window_area (GdkWindow *window, g
 
 	/* Free our GC */
 
-	gdk_gc_destroy (gc);
+	g_object_unref (gc);
 }
 
 
Index: widgets/misc/e-reflow.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-reflow.c,v
retrieving revision 1.64
diff -u -p -r1.64 e-reflow.c
--- widgets/misc/e-reflow.c	28 Feb 2006 10:49:36 -0000	1.64
+++ widgets/misc/e-reflow.c	23 Aug 2006 16:36:18 -0000
@@ -882,8 +882,8 @@ e_reflow_unrealize (GnomeCanvasItem *ite
 	if (!item->canvas->aa) {
 	}
   
-	gdk_cursor_destroy (reflow->arrow_cursor);
-	gdk_cursor_destroy (reflow->default_cursor);
+	gdk_cursor_unref (reflow->arrow_cursor);
+	gdk_cursor_unref (reflow->default_cursor);
 	reflow->arrow_cursor = NULL;
 	reflow->default_cursor = NULL;
 
Index: widgets/misc/e-task-widget.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-task-widget.c,v
retrieving revision 1.4
diff -u -p -r1.4 e-task-widget.c
--- widgets/misc/e-task-widget.c	26 Nov 2004 15:15:36 -0000	1.4
+++ widgets/misc/e-task-widget.c	23 Aug 2006 16:36:19 -0000
@@ -162,9 +162,9 @@ e_task_widget_construct (ETaskWidget *ta
 	gtk_widget_show (priv->label);
 	gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
 
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 	if (mask)
-		gdk_bitmap_unref (mask);
+		g_object_unref (mask);
 
 	priv->tooltips = gtk_tooltips_new ();
 	g_object_ref (priv->tooltips);
Index: widgets/misc/gal-combo-box.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/gal-combo-box.c,v
retrieving revision 1.5
diff -u -p -r1.5 gal-combo-box.c
--- widgets/misc/gal-combo-box.c	11 Jan 2006 10:33:24 -0000	1.5
+++ widgets/misc/gal-combo-box.c	23 Aug 2006 16:36:19 -0000
@@ -429,7 +429,7 @@ gal_combo_box_init (GalComboBox *combo_b
 	gtk_widget_realize (combo_box->priv->popup);
 	cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
 	gdk_window_set_cursor (combo_box->priv->popup->window, cursor);
-	gdk_cursor_destroy (cursor);
+	gdk_cursor_unref (cursor);
 
 	combo_box->priv->torn_off = FALSE;
 	combo_box->priv->tearoff_window = NULL;
@@ -607,7 +607,7 @@ gtk_combo_tearoff_bg_copy (GalComboBox *
 					 widget->allocation.height,
 					 -1);
 
-		gdk_draw_pixmap (pixmap, gc,
+		gdk_draw_drawable (GDK_DRAWABLE (pixmap), gc,
 				 widget->window,
 				 0, 0, 0, 0, -1, -1);
 		gdk_gc_unref (gc);
@@ -618,7 +618,7 @@ gtk_combo_tearoff_bg_copy (GalComboBox *
       
 		gdk_window_set_back_pixmap
 			(combo->priv->tearoff_window->window, pixmap, FALSE);
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 	}
 }
 
Index: widgets/table/e-cell-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-text.c,v
retrieving revision 1.152
diff -u -p -r1.152 e-cell-text.c
--- widgets/table/e-cell-text.c	20 Aug 2006 19:41:18 -0000	1.152
+++ widgets/table/e-cell-text.c	23 Aug 2006 16:36:21 -0000
@@ -425,9 +425,9 @@ ect_unrealize (ECellView *ecv)
 	}
 
 	if (text_view->stipple)
-		gdk_bitmap_unref (text_view->stipple);
+		g_object_unref (text_view->stipple);
 
-	gdk_cursor_destroy (text_view->i_cursor);
+	gdk_cursor_unref (text_view->i_cursor);
 
 	if (ect->colors) {
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
Index: widgets/table/e-cell-toggle.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-cell-toggle.c,v
retrieving revision 1.45
diff -u -p -r1.45 e-cell-toggle.c
--- widgets/table/e-cell-toggle.c	30 Jan 2006 12:28:20 -0000	1.45
+++ widgets/table/e-cell-toggle.c	23 Aug 2006 16:36:22 -0000
@@ -97,7 +97,7 @@ etog_kill_view (ECellView *ecell_view)
 
 	for (i = 0; i < etog->n_states * CACHE_SEQ_COUNT; i++)
 		if (toggle_view->pixmap_cache[i])
-			gdk_pixmap_unref (toggle_view->pixmap_cache[i]);
+			g_object_unref (toggle_view->pixmap_cache[i]);
 	g_free (toggle_view->pixmap_cache);
 	g_free (ecell_view);
 }	
@@ -236,7 +236,7 @@ etog_draw (ECellView *ecell_view, GdkDra
 		height = gdk_pixbuf_get_height (image);
 	}
 
-	gdk_draw_pixmap	 (drawable, toggle_view->gc,
+	gdk_draw_drawable (drawable, toggle_view->gc,
 			  pixmap,
 			  0, 0,
 			  x, y,
@@ -369,7 +369,7 @@ etog_style_set (ECellView *ecell_view, G
 
 	for (i = 0; i < toggle->n_states * CACHE_SEQ_COUNT; i++) {
 		if (toggle_view->pixmap_cache[i]) {
-			gdk_pixmap_unref (toggle_view->pixmap_cache[i]);
+			g_object_unref (toggle_view->pixmap_cache[i]);
 			toggle_view->pixmap_cache[i] = NULL;
 		}
 	}
Index: widgets/table/e-table-field-chooser-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-field-chooser-item.c,v
retrieving revision 1.25
diff -u -p -r1.25 e-table-field-chooser-item.c
--- widgets/table/e-table-field-chooser-item.c	30 Jan 2006 12:28:20 -0000	1.25
+++ widgets/table/e-table-field-chooser-item.c	23 Aug 2006 16:36:22 -0000
@@ -564,12 +564,12 @@ etfci_start_drag (ETableFieldChooserItem
 				    E_TABLE_COL_ARROW_NONE);
 
 	gtk_drag_set_icon_pixmap        (context,
-					 gdk_window_get_colormap (widget->window),
+					 gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
 					 pixmap,
 					 NULL,
 					 etfci->width / 2,
 					 button_height / 2);
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 	etfci->maybe_drag = FALSE;
 }
 
Index: widgets/table/e-table-field-chooser.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-field-chooser.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-table-field-chooser.c
--- widgets/table/e-table-field-chooser.c	30 Jan 2006 12:28:20 -0000	1.24
+++ widgets/table/e-table-field-chooser.c	23 Aug 2006 16:36:22 -0000
@@ -167,7 +167,7 @@ e_table_field_chooser_init (ETableFieldC
 	gtk_widget_reparent(widget,
 			    GTK_WIDGET(etfc));
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 
 	etfc->canvas = GNOME_CANVAS(glade_xml_get_widget(gui, "canvas-buttons"));
 
Index: widgets/table/e-table-header-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-item.c,v
retrieving revision 1.136
diff -u -p -r1.136 e-table-header-item.c
--- widgets/table/e-table-header-item.c	12 Jun 2006 05:05:48 -0000	1.136
+++ widgets/table/e-table-header-item.c	23 Aug 2006 16:36:23 -0000
@@ -491,7 +491,7 @@ make_shaped_window_from_xpm (const char 
 	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
 	gdk_pixbuf_unref (pixbuf);
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 	win = gtk_window_new (GTK_WINDOW_POPUP);
 
 	pix = gtk_image_new_from_pixmap (pixmap, bitmap);
@@ -500,8 +500,8 @@ make_shaped_window_from_xpm (const char 
 	gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
 	gtk_widget_pop_colormap ();
 	
-	gdk_pixmap_unref (pixmap);
-	gdk_bitmap_unref (bitmap);
+	g_object_unref (pixmap);
+	g_object_unref (bitmap);
 	
 	return win;
 }
@@ -950,7 +950,7 @@ ethi_unrealize (GnomeCanvasItem *item)
 	gtk_drag_dest_unset (GTK_WIDGET (item->canvas));
 
 	if (ethi->stipple){
-		gdk_bitmap_unref (ethi->stipple);
+		g_object_unref (ethi->stipple);
 		ethi->stipple = NULL;
 	}
 	
@@ -1216,12 +1216,12 @@ ethi_start_drag (ETableHeaderItem *ethi,
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
 	gtk_drag_set_icon_pixmap (
 		context,
-		gdk_window_get_colormap (widget->window),
+		gdk_drawable_get_colormap (GDK_DRAWABLE (widget->window)),
 		pixmap,
 		NULL,
 		col_width / 2,
 		ethi->height / 2);
-	gdk_pixmap_unref (pixmap);
+	g_object_unref (pixmap);
 
 	ethi->maybe_drag = FALSE;
 	g_hash_table_destroy (arrows);
Index: widgets/table/e-table-header-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-header-utils.c,v
retrieving revision 1.23
diff -u -p -r1.23 e-table-header-utils.c
--- widgets/table/e-table-header-utils.c	12 Jun 2006 09:43:54 -0000	1.23
+++ widgets/table/e-table-header-utils.c	23 Aug 2006 16:36:23 -0000
@@ -455,12 +455,12 @@ e_table_header_draw_button (GdkDrawable 
 		gdk_gc_set_clip_rectangle (gc, NULL);
 
 		if (pixmap) {
-			gdk_draw_pixmap (drawable, gc, pixmap,
+			gdk_draw_drawable (drawable, gc, pixmap,
 					 0, 0,
 					 xpos,
 					 inner_y + (inner_height - clip_height) / 2,
 					 clip_width, clip_height);
-			gdk_pixmap_unref (pixmap);
+			g_object_unref (pixmap);
 		}
 	} else {
 		e_table_draw_elided_string (drawable, gc, widget, 
Index: widgets/table/e-table-item.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table-item.c,v
retrieving revision 1.247
diff -u -p -r1.247 e-table-item.c
--- widgets/table/e-table-item.c	2 Mar 2006 05:39:57 -0000	1.247
+++ widgets/table/e-table-item.c	23 Aug 2006 16:36:25 -0000
@@ -1793,7 +1793,7 @@ eti_unrealize (GnomeCanvasItem *item)
 	eti->grid_gc = NULL;
 	gdk_gc_unref (eti->focus_gc);
 	eti->focus_gc = NULL;
-	gdk_bitmap_unref (eti->stipple);
+	g_object_unref (eti->stipple);
 	eti->stipple = NULL;
 
 	eti_unrealize_cell_views (eti);
Index: widgets/table/e-table.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-table.c,v
retrieving revision 1.241
diff -u -p -r1.241 e-table.c
--- widgets/table/e-table.c	30 Jan 2006 12:28:21 -0000	1.241
+++ widgets/table/e-table.c	23 Aug 2006 16:36:26 -0000
@@ -1533,7 +1533,7 @@ et_real_construct (ETable *e_table, ETab
 	e_table->model = etm;
 	g_object_ref (etm);
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 
 	connect_header (e_table, state);
 	e_table->horizontal_scrolling = specification->horizontal_scrolling;
Index: widgets/table/e-tree-memory.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-tree-memory.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-tree-memory.c
--- widgets/table/e-tree-memory.c	17 Jun 2005 15:20:34 -0000	1.19
+++ widgets/table/e-tree-memory.c	23 Aug 2006 16:36:26 -0000
@@ -38,10 +38,7 @@
 
 #include "e-tree-memory.h"
 
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeMemoryPath))
-
 static ETreeModelClass *parent_class;
-static GMemChunk  *node_chunk;
 
 enum {
 	FILL_IN_CHILDREN,
@@ -358,8 +355,6 @@ e_tree_memory_class_init (ETreeMemoryCla
 
 	parent_class                     = g_type_class_peek_parent (klass);
 	
-	node_chunk                       = g_mem_chunk_create (ETreeMemoryPath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
-
 	signals [FILL_IN_CHILDREN] =
 		g_signal_new ("fill_in_children",
 			      E_OBJECT_CLASS_TYPE (object_class),
@@ -509,7 +504,7 @@ e_tree_memory_node_insert (ETreeMemory *
 	if (!tree_model->priv->frozen)
 		e_tree_model_pre_change(E_TREE_MODEL(tree_model));
 
-	new_path = g_chunk_new0 (ETreeMemoryPath, node_chunk);
+	new_path = g_slice_new0 (ETreeMemoryPath);
 
 	new_path->node_data = node_data;
 	new_path->children_computed = FALSE;
@@ -584,7 +579,7 @@ child_free(ETreeMemory *etree, ETreeMemo
 		etree->priv->destroy_func (node->node_data, etree->priv->destroy_user_data);
 	}
 
-	g_chunk_free(node, node_chunk);
+	g_slice_free (ETreeMemoryPath, node);
 }
 
 /**
Index: widgets/table/e-tree-sorted.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-tree-sorted.c,v
retrieving revision 1.36
diff -u -p -r1.36 e-tree-sorted.c
--- widgets/table/e-tree-sorted.c	17 Jun 2005 15:20:34 -0000	1.36
+++ widgets/table/e-tree-sorted.c	23 Aug 2006 16:36:26 -0000
@@ -47,12 +47,9 @@
 /* maximum insertions between an idle event that we will do without scheduling an idle sort */
 #define ETS_INSERT_MAX (4)
 
-#define TREEPATH_CHUNK_AREA_SIZE (30 * sizeof (ETreeSortedPath))
-
 #define d(x)
 
 static ETreeModel *parent_class;
-static GMemChunk  *node_chunk;
 
 enum {
 	NODE_RESORTED,
@@ -365,7 +362,7 @@ static void
 free_path (ETreeSortedPath *path)
 {
 	free_children(path);
-	g_chunk_free(path, node_chunk);
+	g_slice_free(ETreeSortedPath, path);
 }
 
 static ETreeSortedPath *
@@ -373,7 +370,7 @@ new_path (ETreeSortedPath *parent, ETree
 {
 	ETreeSortedPath *path;
 
-	path = g_chunk_new0 (ETreeSortedPath, node_chunk);
+	path = g_slice_new0 (ETreeSortedPath);
 
 	path->corresponding = corresponding;
 	path->parent = parent;
@@ -1156,8 +1153,6 @@ e_tree_sorted_class_init (ETreeSortedCla
 	GObjectClass *object_class       = G_OBJECT_CLASS (klass);
 
 	parent_class                     = g_type_class_peek_parent (klass);
-
-	node_chunk                       = g_mem_chunk_create (ETreeSortedPath, TREEPATH_CHUNK_AREA_SIZE, G_ALLOC_AND_FREE);
 
 	klass->node_resorted             = NULL;
 	
Index: widgets/table/e-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/table/e-tree.c,v
retrieving revision 1.119
diff -u -p -r1.119 e-tree.c
--- widgets/table/e-tree.c	30 Jan 2006 12:28:21 -0000	1.119
+++ widgets/table/e-tree.c	23 Aug 2006 16:36:28 -0000
@@ -1376,7 +1376,7 @@ et_real_construct (ETree *e_tree, ETreeM
 
 	et_connect_to_etta (e_tree);
 
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 
 	e_tree->priv->sorter = e_sorter_new();
 
Index: widgets/text/e-text.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/text/e-text.c,v
retrieving revision 1.173
diff -u -p -r1.173 e-text.c
--- widgets/text/e-text.c	21 Jul 2006 05:47:37 -0000	1.173
+++ widgets/text/e-text.c	23 Aug 2006 16:36:30 -0000
@@ -229,7 +229,7 @@ e_text_dispose (GObject *object)
 	text->revert = NULL;
 
 	if (text->stipple)
-		gdk_bitmap_unref (text->stipple);
+		g_object_unref (text->stipple);
 	text->stipple = NULL;
 
 	if (text->timeout_id) {
@@ -645,11 +645,11 @@ static void
 set_stipple (EText *text, GdkBitmap *stipple, int reconfigure)
 {
 	if (text->stipple && !reconfigure)
-		gdk_bitmap_unref (text->stipple);
+		g_object_unref (text->stipple);
 
 	text->stipple = stipple;
 	if (stipple && !reconfigure)
-		gdk_bitmap_ref (stipple);
+		g_object_ref (stipple);
 
 	if (text->gc) {
 		if (stipple) {
@@ -1263,9 +1263,9 @@ e_text_unrealize (GnomeCanvasItem *item)
 	gdk_gc_unref (text->gc);
 	text->gc = NULL;
 
-	gdk_cursor_destroy (text->i_cursor);
+	gdk_cursor_unref (text->i_cursor);
 	text->i_cursor = NULL;
-	gdk_cursor_destroy (text->default_cursor);
+	gdk_cursor_unref (text->default_cursor);
 	text->default_cursor = NULL;
 
 	if (parent_class->unrealize)
