diff --git a/ChangeLog b/ChangeLog index 7134937cbf..fa272d508c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7134937cbf..fa272d508c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7134937cbf..fa272d508c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7134937cbf..fa272d508c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7134937cbf..fa272d508c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7134937cbf..fa272d508c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7134937cbf..fa272d508c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,10 @@ -2001-09-09 Alexander Larsson +2001-09-09 Alexander Larsson   + + * gtk/gtkwidget.c (_gtk_widget_peek_colormap): + Really return NULL if not set. + (gtk_widget_init): Remove unused varaible. + +2001-09-09 Alexander Larsson   * configure.in: Remove gdk/nanox/Makefile from AC_OUTPUT(), since it is no longer diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 2d731a7ccf..460038f362 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -1229,8 +1229,6 @@ gtk_widget_get_property (GObject *object, static void gtk_widget_init (GtkWidget *widget) { - GdkColormap *colormap; - GTK_PRIVATE_FLAGS (widget) = PRIVATE_GTK_CHILD_VISIBLE; widget->state = GTK_STATE_NORMAL; widget->saved_state = GTK_STATE_NORMAL; @@ -5351,6 +5349,7 @@ _gtk_widget_peek_colormap (void) { if (colormap_stack) return (GdkColormap*) colormap_stack->data; + return NULL; } static void