diff --git a/ChangeLog b/ChangeLog
index e4b34ac3e0..e6c5244a1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkliststore.c: Allow to disable sorting. This is meant
+	to be internal functionality in 2.4. The new API necessary to
+	use this functionality appears in 2.6. 
+
 2004-09-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_list_children): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e4b34ac3e0..e6c5244a1f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-09-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkliststore.c: Allow to disable sorting. This is meant
+	to be internal functionality in 2.4. The new API necessary to
+	use this functionality appears in 2.6. 
+
 2004-09-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_list_children): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e4b34ac3e0..e6c5244a1f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-09-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkliststore.c: Allow to disable sorting. This is meant
+	to be internal functionality in 2.4. The new API necessary to
+	use this functionality appears in 2.6. 
+
 2004-09-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_list_children): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e4b34ac3e0..e6c5244a1f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-09-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkliststore.c: Allow to disable sorting. This is meant
+	to be internal functionality in 2.4. The new API necessary to
+	use this functionality appears in 2.6. 
+
 2004-09-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemunix.c (gtk_file_folder_unix_list_children): 
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 43e3af7805..2f20030f79 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -2095,7 +2095,8 @@ gtk_list_store_sort (GtkListStore *list_store)
   if (list_store->length <= 1)
     return;
 
-  g_assert (GTK_LIST_STORE_IS_SORTED (list_store));
+  if (!GTK_LIST_STORE_IS_SORTED (list_store))
+    return;
 
   list = G_SLIST (list_store->root);
 
@@ -2353,19 +2354,22 @@ gtk_list_store_set_sort_column_id (GtkTreeSortable  *sortable,
       (list_store->order == order))
     return;
 
-  if (sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+  if (sort_column_id != -2)
     {
-      GtkTreeDataSortHeader *header = NULL;
-
-      header = _gtk_tree_data_list_get_header (list_store->sort_list, sort_column_id);
-
-      /* We want to make sure that we have a function */
-      g_return_if_fail (header != NULL);
-      g_return_if_fail (header->func != NULL);
-    }
-  else
-    {
-      g_return_if_fail (list_store->default_sort_func != NULL);
+      if (sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+	{
+	  GtkTreeDataSortHeader *header = NULL;
+	  
+	  header = _gtk_tree_data_list_get_header (list_store->sort_list, sort_column_id);
+	  
+	  /* We want to make sure that we have a function */
+	  g_return_if_fail (header != NULL);
+	  g_return_if_fail (header->func != NULL);
+	}
+      else
+	{
+	  g_return_if_fail (list_store->default_sort_func != NULL);
+	}
     }