diff --git a/ChangeLog b/ChangeLog index 59ac0bbb96..3d89b1b714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-03-08 Matthias Clasen + + * gtk/gtktextiter.c (_gtk_text_iter_get_indexable_segment): + (_gtk_text_iter_get_any_segment): + (_gtk_text_iter_get_segment_byte): + (_gtk_text_iter_get_segment_char): + (_gtk_text_iter_get_text_line): + (_gtk_text_iter_get_btree): Fix 0/NULL confusion. + * gdk/x11/gdkdnd-x11.c (motif_target_table_check): Return gint. + * gdk/win32/gdkfont-win32.c (gdk_font_equal): + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_get_deskrelative_origin): + (gdk_window_get_origin): + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Fix 0/FALSE confusion. + 2003-03-06 Matthias Clasen * gdk/gdkrgb.c (gdk_rgb_try_colormap): Return gboolean, not gint. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 59ac0bbb96..3d89b1b714 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2003-03-08 Matthias Clasen + + * gtk/gtktextiter.c (_gtk_text_iter_get_indexable_segment): + (_gtk_text_iter_get_any_segment): + (_gtk_text_iter_get_segment_byte): + (_gtk_text_iter_get_segment_char): + (_gtk_text_iter_get_text_line): + (_gtk_text_iter_get_btree): Fix 0/NULL confusion. + * gdk/x11/gdkdnd-x11.c (motif_target_table_check): Return gint. + * gdk/win32/gdkfont-win32.c (gdk_font_equal): + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_get_deskrelative_origin): + (gdk_window_get_origin): + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Fix 0/FALSE confusion. + 2003-03-06 Matthias Clasen * gdk/gdkrgb.c (gdk_rgb_try_colormap): Return gboolean, not gint. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 59ac0bbb96..3d89b1b714 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2003-03-08 Matthias Clasen + + * gtk/gtktextiter.c (_gtk_text_iter_get_indexable_segment): + (_gtk_text_iter_get_any_segment): + (_gtk_text_iter_get_segment_byte): + (_gtk_text_iter_get_segment_char): + (_gtk_text_iter_get_text_line): + (_gtk_text_iter_get_btree): Fix 0/NULL confusion. + * gdk/x11/gdkdnd-x11.c (motif_target_table_check): Return gint. + * gdk/win32/gdkfont-win32.c (gdk_font_equal): + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_get_deskrelative_origin): + (gdk_window_get_origin): + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Fix 0/FALSE confusion. + 2003-03-06 Matthias Clasen * gdk/gdkrgb.c (gdk_rgb_try_colormap): Return gboolean, not gint. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 59ac0bbb96..3d89b1b714 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2003-03-08 Matthias Clasen + + * gtk/gtktextiter.c (_gtk_text_iter_get_indexable_segment): + (_gtk_text_iter_get_any_segment): + (_gtk_text_iter_get_segment_byte): + (_gtk_text_iter_get_segment_char): + (_gtk_text_iter_get_text_line): + (_gtk_text_iter_get_btree): Fix 0/NULL confusion. + * gdk/x11/gdkdnd-x11.c (motif_target_table_check): Return gint. + * gdk/win32/gdkfont-win32.c (gdk_font_equal): + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_get_deskrelative_origin): + (gdk_window_get_origin): + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Fix 0/FALSE confusion. + 2003-03-06 Matthias Clasen * gdk/gdkrgb.c (gdk_rgb_try_colormap): Return gboolean, not gint. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 59ac0bbb96..3d89b1b714 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2003-03-08 Matthias Clasen + + * gtk/gtktextiter.c (_gtk_text_iter_get_indexable_segment): + (_gtk_text_iter_get_any_segment): + (_gtk_text_iter_get_segment_byte): + (_gtk_text_iter_get_segment_char): + (_gtk_text_iter_get_text_line): + (_gtk_text_iter_get_btree): Fix 0/NULL confusion. + * gdk/x11/gdkdnd-x11.c (motif_target_table_check): Return gint. + * gdk/win32/gdkfont-win32.c (gdk_font_equal): + * gdk/linux-fb/gdkwindow-fb.c (gdk_window_get_deskrelative_origin): + (gdk_window_get_origin): + * gdk/linux-fb/gdkcolor-fb.c (gdk_colors_alloc): Fix 0/FALSE confusion. + 2003-03-06 Matthias Clasen * gdk/gdkrgb.c (gdk_rgb_try_colormap): Return gboolean, not gint. diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7d9ce7865a..7fae7b9a91 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2003-03-08 Matthias Clasen + + Bug #107664 continued: + + * io-xpm.c (find_color): Fix 0/FALSE confusion + * gdk-pixbuf.c (gdk_pixbuf_get_has_alpha): Fix -1/gboolean confusion. + 2003-03-06 Matthias Clasen * io-gif.c (gif_read): Fix 0/FALSE confusion (#107664, Morten Welinder) diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index 5a73cb743b..2ae4bc6450 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -322,7 +322,7 @@ gdk_pixbuf_get_n_channels (const GdkPixbuf *pixbuf) gboolean gdk_pixbuf_get_has_alpha (const GdkPixbuf *pixbuf) { - g_return_val_if_fail (pixbuf != NULL, -1); + g_return_val_if_fail (pixbuf != NULL, FALSE); return pixbuf->has_alpha ? TRUE : FALSE; } diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c index ca0b81ebcc..5be7c48e53 100644 --- a/gdk-pixbuf/io-xpm.c +++ b/gdk-pixbuf/io-xpm.c @@ -911,7 +911,7 @@ find_color(const char *name, found = bsearch (name, xColors, numXColors, sizeof (XPMColorEntry), compare_xcolor_entries); if (found == NULL) - return 0; + return FALSE; colorPtr->red = (found->red * 65535) / 255; colorPtr->green = (found->green * 65535) / 255; diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index 4466d06fcd..3bcf05929c 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -1551,7 +1551,7 @@ gdk_window_get_origin (GdkWindow *window, gint *x, gint *y) { - g_return_val_if_fail (window != NULL, 0); + g_return_val_if_fail (window != NULL, FALSE); if (x) *x = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_x; diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index 1e368628cc..1a91134504 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -1418,17 +1418,17 @@ gdk_font_equal (const GdkFont *fonta, { if (((GdkWin32SingleFont *) lista->data)->hfont != ((GdkWin32SingleFont *) listb->data)->hfont) - return 0; + return FALSE; lista = lista->next; listb = listb->next; } if (lista || listb) - return 0; + return FALSE; else - return 1; + return TRUE; } else - return 0; + return FALSE; } /* Return the Unicode Subset bitfield number for a Unicode character */ diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index abfd416ba8..d4109aa62b 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -992,7 +992,7 @@ targets_sort_func (gconstpointer a, gconstpointer b) } /* Check if given (sorted) list is in the targets table */ -static gboolean +static gint motif_target_table_check (GdkDisplay *display, GList *sorted) { @@ -1039,7 +1039,7 @@ motif_add_to_target_table (GdkDisplay *display, targets = targets->next; } - /* First check if it is their already */ + /* First check if it is there already */ if (display_x11->motif_target_lists) index = motif_target_table_check (display, sorted); @@ -1062,7 +1062,7 @@ motif_add_to_target_table (GdkDisplay *display, /* Check again, in case it was added in the meantime */ if (display_x11->motif_target_lists) - index = motif_target_table_check (display, sorted); + index = motif_target_table_check (display, sorted); if (index < 0) { diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index ecc2b40762..87fbe2db8c 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -481,7 +481,7 @@ _gtk_text_iter_get_indexable_segment (const GtkTextIter *iter) { GtkTextRealIter *real; - g_return_val_if_fail (iter != NULL, 0); + g_return_val_if_fail (iter != NULL, NULL); real = gtk_text_iter_make_real (iter); @@ -500,7 +500,7 @@ _gtk_text_iter_get_any_segment (const GtkTextIter *iter) { GtkTextRealIter *real; - g_return_val_if_fail (iter != NULL, 0); + g_return_val_if_fail (iter != NULL, NULL); real = gtk_text_iter_make_real (iter); @@ -519,7 +519,7 @@ _gtk_text_iter_get_segment_byte (const GtkTextIter *iter) { GtkTextRealIter *real; - g_return_val_if_fail (iter != NULL, 0); + g_return_val_if_fail (iter != NULL, NULL); real = gtk_text_iter_make_real (iter); @@ -538,7 +538,7 @@ _gtk_text_iter_get_segment_char (const GtkTextIter *iter) { GtkTextRealIter *real; - g_return_val_if_fail (iter != NULL, 0); + g_return_val_if_fail (iter != NULL, NULL); real = gtk_text_iter_make_real (iter); @@ -559,7 +559,7 @@ _gtk_text_iter_get_text_line (const GtkTextIter *iter) { const GtkTextRealIter *real; - g_return_val_if_fail (iter != NULL, 0); + g_return_val_if_fail (iter != NULL, NULL); real = (const GtkTextRealIter*)iter; @@ -573,7 +573,7 @@ _gtk_text_iter_get_btree (const GtkTextIter *iter) { const GtkTextRealIter *real; - g_return_val_if_fail (iter != NULL, 0); + g_return_val_if_fail (iter != NULL, NULL); real = (const GtkTextRealIter*)iter;