** Fixes bug #352450

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.

svn path=/trunk/; revision=32783

19 files changed, 76 insertions, 62 deletions

diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 0f342e3c05..5e75b70b4b 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -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:
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index bd75b6a128..b2738847b7 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -161,11 +161,11 @@ set_stipple (ECanvasBackground *ecb, GdkBitmap *stipple, int use_value)
 {
 	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);
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index 25a37b8b6e..07587cabb3 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -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);
 }
 
 
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 24639a068c..8acbdf5fe6 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -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, gint area_x, gint area_y, gint target_x,
 
 	/* 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, gint area_x, gint area_y, gint target_x,
 				/* 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, gint area_x, gint area_y, gint target_x,
 				/* 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, gint area_x, gint area_y, gint target_x,
 				/* 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, gint area_x, gint area_y, gint target_x,
 				/* 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, gint area_x, gint area_y, gint target_x,
 
 	/* Free our GC */
 
-	gdk_gc_destroy (gc);
+	g_object_unref (gc);
 }
 
 
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 128f45ba12..0615effe6d 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -882,8 +882,8 @@ e_reflow_unrealize (GnomeCanvasItem *item)
 	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;
 
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index f382670cd5..46e69342e6 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -162,9 +162,9 @@ e_task_widget_construct (ETaskWidget *task_widget,
 	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);
diff --git a/widgets/misc/gal-combo-box.c b/widgets/misc/gal-combo-box.c
index 93cc5205f6..46e42ec788 100644
--- a/widgets/misc/gal-combo-box.c
+++ b/widgets/misc/gal-combo-box.c
@@ -429,7 +429,7 @@ gal_combo_box_init (GalComboBox *combo_box)
 	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 *combo)
 					 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 *combo)
       
 		gdk_window_set_back_pixmap
 			(combo->priv->tearoff_window->window, pixmap, FALSE);
-		gdk_pixmap_unref (pixmap);
+		g_object_unref (pixmap);
 	}
 }
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 31d5f91dc4..35bce6cf0b 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -414,9 +414,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));
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 2892b18598..609d097f6f 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -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, GdkDrawable *drawable,
 		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, GtkStyle *previous_style)
 
 	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;
 		}
 	}
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 435b7c63c2..0d72dc7ad8 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -564,12 +564,12 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, doub
 				    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;
 }
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index b3554f86cf..786e0420b7 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -167,7 +167,7 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
 	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"));
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 1e6d9bad29..d42696be83 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -491,7 +491,7 @@ make_shaped_window_from_xpm (const char **xpm)
 	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 **xpm)
 	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, GdkEvent *event)
 			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);
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 9eaba9d843..7c1ec98f78 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -455,12 +455,12 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		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, 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index f17108ed4a..27b48184b8 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -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);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 2122a015ca..cc64d854e1 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1533,7 +1533,7 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 	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;
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 2e87c8da86..7de48802fd 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -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 (ETreeMemoryClass *klass)
 
 	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 *tree_model,
 	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, ETreeMemoryPath *node)
 		etree->priv->destroy_func (node->node_data, etree->priv->destroy_user_data);
 	}
 
-	g_chunk_free(node, node_chunk);
+	g_slice_free (ETreeMemoryPath, node);
 }
 
 /**
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 56af65dd7d..b5c67dc906 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -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, ETreePath corresponding)
 {
 	ETreeSortedPath *path;
 
-	path = g_chunk_new0 (ETreeSortedPath, node_chunk);
+	path = g_slice_new0 (ETreeSortedPath);
 
 	path->corresponding = corresponding;
 	path->parent = parent;
@@ -1157,8 +1154,6 @@ e_tree_sorted_class_init (ETreeSortedClass *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;
 	
 	object_class->dispose            = ets_dispose;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index afbb484964..c3be4f0c24 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1376,7 +1376,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 
 	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();
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 1cc802260e..24e3ced5e9 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -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)