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)

diff --git a/ChangeLog b/ChangeLog
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6d9738efd371031abdaa1723f998cc907ada7a36..99e30616817cb636ff53e74b46b01790e2b0b107 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 86e0f257f74332813b7a6dc0b8cc86d0bb2fbb8f..4aed5bf5d3cae03cbf38a7383935b405fb7040d8 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -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))

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index e10a3387c84a1f150c08be6c4544586e619a0b62..9fa74569fc22028f7df3b07406a459b1004acc53 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -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;
     }