diff src/dnd-hints.c @ 4793:677d3cb193a1

[gaim-migrate @ 5113] this removes all the remaining deprecated glib, gdk, gdk-pixbuf, and gtk function calls. Hopefully I didn't break anything. Most of this is due to the deprecation of g_strcasecmp and g_strncasecmp. Two functions I never thought would be deprecated, but apparently they're no good at comparing utf8 text. g_ascii_str{,n}casecmp is OK when you're sure that it's ASCII. Otherwise, we're supposed to use g_utf8_collate(), except that it is case sensitive. Since glib doesn't currently have a case-insensitive one, I wrote one. If you need to compare utf8 text, you can use gaim_utf8_strcasecmp(). I have to go do dishes now. committer: Tailor Script <[e-mail]>

--- a/src/dnd-hints.c	Sat Mar 15 22:22:39 2003 +0000
+++ b/src/dnd-hints.c	Sun Mar 16 00:01:49 2003 +0000
@@ -61,9 +61,9 @@
 	g_return_val_if_fail(pixbuf, NULL);
 
 	gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &bitmap, 128);
-	gdk_pixbuf_unref(pixbuf);
+	g_object_unref(G_OBJECT(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);
 	gtk_widget_realize(win);
@@ -71,8 +71,8 @@
 	gtk_widget_shape_combine_mask(win, bitmap, 0, 0);
 	gtk_widget_pop_colormap();
 
-	gdk_pixmap_unref(pixmap);
-	gdk_bitmap_unref(bitmap);
+	g_object_unref(G_OBJECT(pixmap));
+	g_object_unref(G_OBJECT(bitmap));
 
 	gtk_widget_show_all(pix);
 
@@ -95,7 +95,7 @@
 	else
 	{
 		gdk_window_get_origin(w->window, &ox, &oy);
-		gdk_window_get_size(w->window, &width, &height);
+		gdk_drawable_get_size(w->window, &width, &height);
 	}
 
 	if (x1) *x1 = ox;