forked from AuroraMiddleware/gtk
Don't leave dangling ->prev fields when merging lists. (Found
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling ->prev fields when merging lists. (Found simultaneously by Pawel Salek and Jakub Jelinek)
This commit is contained in:
parent
843b1789a3
commit
41885abc7c
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
Fri Aug 18 17:27:46 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtkclist.c (gtk_clist_merge): Don't leave dangling
|
||||
->prev fields when merging lists. (Found simultaneously
|
||||
by Pawel Salek and Jakub Jelinek)
|
||||
|
||||
2000-08-12 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def
|
||||
@ -36,7 +42,8 @@
|
||||
|
||||
2000-08-03 Elliot Lee <sopwith@redhat.com>
|
||||
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't runs with a PANGO_ATTR_SHAPE set.
|
||||
* gdk/gdkpango.c (gdk_draw_layout_line): Don't shape runs with a
|
||||
PANGO_ATTR_SHAPE set.
|
||||
|
||||
Thu Aug 3 09:17:06 2000 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
|
@ -771,7 +771,7 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
|
||||
|
||||
image_info->bitmap = (image_info->visual->depth == 1);
|
||||
|
||||
/* Try to allocate as few possible shared images */
|
||||
/* Try to allocate as few possible shared images */
|
||||
for (i=0; i < G_N_ELEMENTS (possible_n_images); i++)
|
||||
{
|
||||
if (gdk_rgb_allocate_images (image_info, possible_n_images[i], TRUE))
|
||||
|
@ -7414,6 +7414,7 @@ gtk_clist_merge (GtkCList *clist,
|
||||
}
|
||||
}
|
||||
|
||||
z.next->prev = NULL;
|
||||
return z.next;
|
||||
}
|
||||
|
||||
@ -7425,7 +7426,7 @@ gtk_clist_mergesort (GtkCList *clist,
|
||||
GList *half;
|
||||
gint i;
|
||||
|
||||
if (num == 1)
|
||||
if (num <= 1)
|
||||
{
|
||||
return list;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user