AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't leave dangling ->prev fields when merging lists. (Found

Browse Source 
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:
Owen Taylor 2000-08-18 21:32:48 +00:00 committed by Owen Taylor
parent 843b1789a3
commit 41885abc7c
9 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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>

9
ChangeLog.pre-2-0
View File

@ -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>

9
ChangeLog.pre-2-10
View File

@ -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>

9
ChangeLog.pre-2-2
View File

@ -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>

9
ChangeLog.pre-2-4
View File

@ -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>

9
ChangeLog.pre-2-6
View File

@ -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>

9
ChangeLog.pre-2-8
View File

@ -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>

3
gtk/gtkclist.c
View File

@ -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;
}