From 13bcd2c002d6677d9eb153620e26d17366b3fe54 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sat, 1 Apr 2006 00:25:00 +0000 Subject: Return NULL instead of FALSE in g_return_val_if_fail in a 2006-03-31 Behdad Esfahbod * gtk/gtkfilesystem.c (gtk_file_system_get_bookmark_label): * gtk/gtklinkbutton.c (gtk_link_button_new_with_label): Return NULL instead of FALSE in g_return_val_if_fail in a pointer-returning function. (#336764, Morten Welinder) --- ChangeLog | 9 ++++++++- ChangeLog.pre-2-10 | 9 ++++++++- gtk/gtkfilesystem.c | 2 +- gtk/gtklinkbutton.c | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ad2d243bf..d4d5ad86ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ +2006-03-31 Behdad Esfahbod + + * gtk/gtkfilesystem.c (gtk_file_system_get_bookmark_label): + * gtk/gtklinkbutton.c (gtk_link_button_new_with_label): Return NULL + instead of FALSE in g_return_val_if_fail in a pointer-returning + function. (#336764, Morten Welinder) + 2006-04-01 Gora Mohanty - * configure.in: Added 'or' (Oriya) to ALL_LINGUAS. + * configure.in: Added 'or' (Oriya) to ALL_LINGUAS. 2006-03-31 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0ad2d243bf..d4d5ad86ac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,6 +1,13 @@ +2006-03-31 Behdad Esfahbod + + * gtk/gtkfilesystem.c (gtk_file_system_get_bookmark_label): + * gtk/gtklinkbutton.c (gtk_link_button_new_with_label): Return NULL + instead of FALSE in g_return_val_if_fail in a pointer-returning + function. (#336764, Morten Welinder) + 2006-04-01 Gora Mohanty - * configure.in: Added 'or' (Oriya) to ALL_LINGUAS. + * configure.in: Added 'or' (Oriya) to ALL_LINGUAS. 2006-03-31 Matthias Clasen diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 6044390570..9158d6dba2 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -793,7 +793,7 @@ gtk_file_system_get_bookmark_label (GtkFileSystem *file_system, GtkFileSystemIface *iface; g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL); - g_return_val_if_fail (path != NULL, FALSE); + g_return_val_if_fail (path != NULL, NULL); iface = GTK_FILE_SYSTEM_GET_IFACE (file_system); if (iface->get_bookmark_label) diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index a68ca3b267..81b8b657d6 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -563,7 +563,7 @@ gtk_link_button_new_with_label (const gchar *uri, { GtkWidget *retval; - g_return_val_if_fail (uri != NULL, FALSE); + g_return_val_if_fail (uri != NULL, NULL); if (!label) return gtk_link_button_new (uri); -- cgit v1.2.1