** 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

6 files changed, 24 insertions, 24 deletions

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);
 	}
 }