diff --git a/ChangeLog b/ChangeLog index 6157bd99d6..92de7c462f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2004-01-30 Federico Mena Quintero + + Fixes #132975. + + * gtk/gtkfilesystem.c (gtk_file_system_make_path): Return NULL, + not FALSE. + (gtk_file_system_volume_render_icon): Likewise. + + * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): + Likewise. + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Return 0, + not FALSE. + + * gtk/gtktoolbar.c (gtk_toolbar_get_drop_index): Return -1, not + FALSE. + + * gtk/gtktextiter.c (gtk_text_iter_get_chars_in_line): Return 0, + not FALSE. + (gtk_text_iter_get_bytes_in_line): Likewise. + + * gdk/x11/gdkcursor-x11.c (gdk_display_get_default_cursor_size): + Likewise. + + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Return FALSE, not + 0. + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6157bd99d6..92de7c462f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,30 @@ +2004-01-30 Federico Mena Quintero + + Fixes #132975. + + * gtk/gtkfilesystem.c (gtk_file_system_make_path): Return NULL, + not FALSE. + (gtk_file_system_volume_render_icon): Likewise. + + * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): + Likewise. + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Return 0, + not FALSE. + + * gtk/gtktoolbar.c (gtk_toolbar_get_drop_index): Return -1, not + FALSE. + + * gtk/gtktextiter.c (gtk_text_iter_get_chars_in_line): Return 0, + not FALSE. + (gtk_text_iter_get_bytes_in_line): Likewise. + + * gdk/x11/gdkcursor-x11.c (gdk_display_get_default_cursor_size): + Likewise. + + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Return FALSE, not + 0. + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6157bd99d6..92de7c462f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,30 @@ +2004-01-30 Federico Mena Quintero + + Fixes #132975. + + * gtk/gtkfilesystem.c (gtk_file_system_make_path): Return NULL, + not FALSE. + (gtk_file_system_volume_render_icon): Likewise. + + * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): + Likewise. + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Return 0, + not FALSE. + + * gtk/gtktoolbar.c (gtk_toolbar_get_drop_index): Return -1, not + FALSE. + + * gtk/gtktextiter.c (gtk_text_iter_get_chars_in_line): Return 0, + not FALSE. + (gtk_text_iter_get_bytes_in_line): Likewise. + + * gdk/x11/gdkcursor-x11.c (gdk_display_get_default_cursor_size): + Likewise. + + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Return FALSE, not + 0. + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6157bd99d6..92de7c462f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,30 @@ +2004-01-30 Federico Mena Quintero + + Fixes #132975. + + * gtk/gtkfilesystem.c (gtk_file_system_make_path): Return NULL, + not FALSE. + (gtk_file_system_volume_render_icon): Likewise. + + * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): + Likewise. + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Return 0, + not FALSE. + + * gtk/gtktoolbar.c (gtk_toolbar_get_drop_index): Return -1, not + FALSE. + + * gtk/gtktextiter.c (gtk_text_iter_get_chars_in_line): Return 0, + not FALSE. + (gtk_text_iter_get_bytes_in_line): Likewise. + + * gdk/x11/gdkcursor-x11.c (gdk_display_get_default_cursor_size): + Likewise. + + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Return FALSE, not + 0. + 2004-01-30 Not Zed Fixes #132929. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6157bd99d6..92de7c462f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,30 @@ +2004-01-30 Federico Mena Quintero + + Fixes #132975. + + * gtk/gtkfilesystem.c (gtk_file_system_make_path): Return NULL, + not FALSE. + (gtk_file_system_volume_render_icon): Likewise. + + * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): + Likewise. + + * gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Return 0, + not FALSE. + + * gtk/gtktoolbar.c (gtk_toolbar_get_drop_index): Return -1, not + FALSE. + + * gtk/gtktextiter.c (gtk_text_iter_get_chars_in_line): Return 0, + not FALSE. + (gtk_text_iter_get_bytes_in_line): Likewise. + + * gdk/x11/gdkcursor-x11.c (gdk_display_get_default_cursor_size): + Likewise. + + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Return FALSE, not + 0. + 2004-01-30 Not Zed Fixes #132929. diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c index 179d1b7502..20903d6089 100644 --- a/gdk/linux-fb/gdkcolor-fb.c +++ b/gdk/linux-fb/gdkcolor-fb.c @@ -753,7 +753,7 @@ gdk_colors_alloc (GdkColormap *colormap, private = GDK_COLORMAP_PRIVATE_DATA (colormap); if (nplanes > 0) - return 0; + return FALSE; found = 0; for (i = 1; i < colormap->size; i++) diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index e69bb28232..24b5a340f7 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -560,7 +560,7 @@ gdk_display_supports_cursor_color (GdkDisplay *display) guint gdk_display_get_default_cursor_size (GdkDisplay *display) { - g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); + g_return_val_if_fail (GDK_IS_DISPLAY (display), 0); /* no idea, really */ return 20; diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 31d73d3ddc..de1cb6e8c4 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -480,7 +480,7 @@ gtk_file_system_volume_render_icon (GtkFileSystem *file_system, g_return_val_if_fail (volume != NULL, NULL); g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); g_return_val_if_fail (pixel_size > 0, NULL); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); return GTK_FILE_SYSTEM_GET_IFACE (file_system)->volume_render_icon (file_system, volume, @@ -536,7 +536,7 @@ gtk_file_system_make_path (GtkFileSystem *file_system, g_return_val_if_fail (GTK_IS_FILE_SYSTEM (file_system), NULL); g_return_val_if_fail (base_path != NULL, NULL); g_return_val_if_fail (display_name != NULL, NULL); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); return GTK_FILE_SYSTEM_GET_IFACE (file_system)->make_path (file_system, base_path, display_name, error); } diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index 3ead85faae..7d21376deb 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -528,7 +528,7 @@ gtk_file_system_win32_make_path (GtkFileSystem *file_system, g_error_free (tmp_error); g_free (base_filename); - return FALSE; + return NULL; } full_filename = g_build_filename (base_filename, filename, NULL); diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 823ddf253e..b7ab25fa10 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -1649,7 +1649,7 @@ gtk_text_iter_get_chars_in_line (const GtkTextIter *iter) gint count; GtkTextLineSegment *seg; - g_return_val_if_fail (iter != NULL, FALSE); + g_return_val_if_fail (iter != NULL, 0); real = gtk_text_iter_make_surreal (iter); @@ -1701,7 +1701,7 @@ gtk_text_iter_get_bytes_in_line (const GtkTextIter *iter) gint count; GtkTextLineSegment *seg; - g_return_val_if_fail (iter != NULL, FALSE); + g_return_val_if_fail (iter != NULL, 0); real = gtk_text_iter_make_surreal (iter); diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 8a4226484f..45f98d4819 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -2944,7 +2944,7 @@ gtk_toolbar_get_drop_index (GtkToolbar *toolbar, gint x, gint y) { - g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), FALSE); + g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), -1); if (!gtk_toolbar_check_new_api (toolbar)) return -1; diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 65f3194bec..bdb5ef5d22 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -717,7 +717,7 @@ gtk_tree_store_iter_n_children (GtkTreeModel *tree_model, gint i = 0; g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0); - g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE); + g_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0); if (iter == NULL) node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;