# HG changeset patch # User Stephen J. Turnbull # Date 1204708373 28800 # Node ID 1bf48c59700efe2451da808710e77fc39efd6532 # Parent 87ef74baf946e3698d06f58fe66d67cb1083a6b0 Fix old use of rvalue on lhs to placate gcc >4.0. diff -r 87ef74baf946 -r 1bf48c59700e src/ChangeLog --- a/src/ChangeLog Wed Mar 05 01:11:21 2008 -0800 +++ b/src/ChangeLog Wed Mar 05 01:12:53 2008 -0800 @@ -1,3 +1,10 @@ +2008-03-05 Dominique Quatravaux + + * glyphs-gtk.c (init_image_instance_from_gdk_image): + (gtk_colorize_image_instance): + Use IMAGE_INSTANCE_PIXMAP_MASK (an lvalue), not + IMAGE_INSTANCE_GTK_MASK (an rvalue). + 2008-03-05 Dominique Quatravaux * console-gtk.c (gtk_perhaps_init_unseen_key_defaults): Fix typo. diff -r 87ef74baf946 -r 1bf48c59700e src/glyphs-gtk.c --- a/src/glyphs-gtk.c Wed Mar 05 01:11:21 2008 -0800 +++ b/src/glyphs-gtk.c Wed Mar 05 01:12:53 2008 -0800 @@ -796,7 +796,7 @@ find_keyword_in_vector (instantiator, Q_file); IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap; - IMAGE_INSTANCE_GTK_MASK (ii) = 0; + IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0; IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width; IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height; IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth; @@ -2972,7 +2972,7 @@ IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP; /* Make sure there aren't two pointers to the same mask, causing it to get freed twice. */ - IMAGE_INSTANCE_GTK_MASK (p) = 0; + IMAGE_INSTANCE_PIXMAP_MASK (p) = 0; break; default: