From d142827b34d15ae3f85c8b7d7d1fa5ec55171fe7 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 4 May 1998 02:10:36 +0000 Subject: Merges from the gtk-1-0 branch Sun May 3 14:55:34 1998 Owen Taylor * docs/gtkfaq.sgml (CPPFLAGS): Added a FAQ entry about "glibconfig.h" and another about writing another IRC client. Sat May 2 00:14:05 1998 Owen Taylor * gtk/gtkpreview.c (gtk_trim_cmap): Make sure the parameters to log are doubles. Digital Unix apparently is missing the argument in its prototype. Sun May 3 19:04:46 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_state_changed): Don't force a clear until the widget is actually on screen. Hopefully nothing else though CVS think there are a whole bunch more changed files. --- gdk/gdkwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdk/gdkwindow.c') diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 7836f27077..21b10590d0 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1226,7 +1226,7 @@ gdk_window_get_colormap (GdkWindow *window) g_return_val_if_fail (window_private->window_type != GDK_WINDOW_PIXMAP, NULL); if (!window_private->destroyed) { - if (window_private->colormap == NULL) + if (window_private->colormap == NULL) { XGetWindowAttributes (window_private->xdisplay, window_private->xwindow, -- cgit v1.2.1