From d102c8eccb9d5b5f4caa8c5573b8b464e72df325 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 30 Nov 2000 01:45:56 +0000 Subject: [PATCH] Allow mask to be NULL. Wed Nov 29 20:44:09 2000 Owen Taylor * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to be NULL. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkclist.c | 3 ++- 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c9d2093798..216f2d5047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c9d2093798..216f2d5047 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c9d2093798..216f2d5047 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c9d2093798..216f2d5047 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c9d2093798..216f2d5047 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c9d2093798..216f2d5047 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c9d2093798..216f2d5047 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Nov 29 20:44:09 2000 Owen Taylor + + * gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to + be NULL. + Thu Oct 26 02:10:32 2000 Tim Janik [ Backport from 1.3 / otaylor, 29 Nov 2000 ] diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 07ec337d7b..fbf2c9c338 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2375,7 +2375,8 @@ gtk_clist_get_pixtext (GtkCList *clist, *pixmap = GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap; /* mask can be NULL */ - *mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask; + if (mask) + *mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask; return 1; }