summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-07-18 22:06:40 +0000
committerDarin Adler <darin@src.gnome.org>2001-07-18 22:06:40 +0000
commitf500db339a6db572819663947933396cf79c3534 (patch)
tree6f89582d1b35638a4f73059cf23da4236b1127b3 /gdk
parent94239d144e223cacbffceeb804e44ceedbf2f6b1 (diff)
downloadgdk-pixbuf-f500db339a6db572819663947933396cf79c3534.tar.gz
Reorder code so that we don't get a g_warning message every time we
* gtk/gtkiconfactory.c: (gtk_icon_size_register): Reorder code so that we don't get a g_warning message every time we register a new icon size. * gdk/x11/gdkcolor-x11.c: (gdk_colormap_alloc1): Fix warning by using pixel variable of the correct type.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkcolor-x11.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 24e6d3efe..af6a1172d 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -610,7 +610,7 @@ gdk_colormap_alloc1 (GdkColormap *colormap,
if (private->info[ret->pixel].ref_count) /* got a duplicate */
{
XFreeColors (private->xdisplay, private->xcolormap,
- &ret->pixel, 1, 0);
+ &xcolor.pixel, 1, 0);
}
else
{