filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

[~andy/gtk] / gtk / gtkliststore.c

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 2d99d5f36c7e25132d2680d6bdb97f70d98230b8..467bac0f15dc4da7b0a98336a01fe22f63952e7c 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -418,7 +418,7 @@ iter_is_valid (GtkTreeIter  *iter,
  * in.  Note that only types derived from standard GObject fundamental types
  * are supported.
  *
- * As an example, <literal>gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
+ * As an example, <literal>gtk_list_store_new (3, G_TYPE_INT, G_TYPE_STRING,
  * GDK_TYPE_PIXBUF);</literal> will create a new #GtkListStore with three columns, of type
  * int, string and #GdkPixbuf respectively.
  *
@@ -1249,12 +1249,12 @@ gtk_list_store_remove (GtkListStore *list_store,
  * gtk_list_store_insert:
  * @list_store: A #GtkListStore
  * @iter: (out): An unset #GtkTreeIter to set to the new row
- * @position: position to insert the new row
+ * @position: position to insert the new row, or -1 for last
  *
  * Creates a new row at @position.  @iter will be changed to point to this new
- * row.  If @position is larger than the number of rows on the list, then the
- * new row will be appended to the list. The row will be empty after this
- * function is called.  To fill in values, you need to call 
+ * row.  If @position is -1 or is larger than the number of rows on the list,
+ * then the new row will be appended to the list. The row will be empty after
+ * this function is called.  To fill in values, you need to call
  * gtk_list_store_set() or gtk_list_store_set_value().
  *
  **/
@@ -1271,7 +1271,6 @@ gtk_list_store_insert (GtkListStore *list_store,
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (iter != NULL);
-  g_return_if_fail (position >= 0);
 
   priv = list_store->priv;
 
@@ -1280,7 +1279,7 @@ gtk_list_store_insert (GtkListStore *list_store,
   seq = priv->seq;
 
   length = g_sequence_get_length (seq);
-  if (position > length)
+  if (position > length || position < 0)
     position = length;
 
   ptr = g_sequence_get_iter_at_pos (seq, position);
@@ -1405,14 +1404,10 @@ void
 gtk_list_store_append (GtkListStore *list_store,
                       GtkTreeIter  *iter)
 {
-  GtkListStorePrivate *priv;
-
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (iter != NULL);
 
-  priv = list_store->priv;
-
-  gtk_list_store_insert (list_store, iter, g_sequence_get_length (priv->seq));
+  gtk_list_store_insert (list_store, iter, -1);
 }
 
 static void
@@ -1691,11 +1686,12 @@ gtk_list_store_reorder_func (GSequenceIter *a,
 }
   
 /**
- * gtk_list_store_reorder: (skip)
+ * gtk_list_store_reorder:
  * @store: A #GtkListStore.
- * @new_order: (array): an array of integers mapping the new position of each child
- *      to its old position before the re-ordering,
- *      i.e. @new_order<literal>[newpos] = oldpos</literal>.
+ * @new_order: (array zero-terminated=1): an array of integers mapping the new
+ *      position of each child to its old position before the re-ordering,
+ *      i.e. @new_order<literal>[newpos] = oldpos</literal>. It must have
+ *      exactly as many items as the list store's length.
  *
  * Reorders @store to follow the order indicated by @new_order. Note that
  * this function only works with unsorted stores.
@@ -2224,7 +2220,7 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,
   seq = priv->seq;
 
   length = g_sequence_get_length (seq);
-  if (position > length)
+  if (position > length || position < 0)
     position = length;
 
   ptr = g_sequence_get_iter_at_pos (seq, position);
@@ -2260,7 +2256,7 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,
  * gtk_list_store_insert_with_valuesv:
  * @list_store: A #GtkListStore
  * @iter: (out) (allow-none): An unset #GtkTreeIter to set to the new row, or %NULL.
- * @position: position to insert the new row
+ * @position: position to insert the new row, or -1 for last
  * @columns: (array length=n_values): an array of column numbers
  * @values: (array length=n_values): an array of GValues 
  * @n_values: the length of the @columns and @values arrays
@@ -2304,7 +2300,7 @@ gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
   seq = priv->seq;
 
   length = g_sequence_get_length (seq);
-  if (position > length)
+  if (position > length || position < 0)
     position = length;
 
   ptr = g_sequence_get_iter_at_pos (seq, position);
@@ -2441,10 +2437,12 @@ list_store_start_element (GMarkupParseContext *context,
   else if (strcmp (element_name, "row") == 0)
     ;
   else if (strcmp (element_name, "column") == 0)
-    for (i = 0; names[i]; i++)
-      if (strcmp (names[i], "type") == 0)
-       data->column_type_names = g_slist_prepend (data->column_type_names,
-                                                  g_strdup (values[i]));
+    {
+      for (i = 0; names[i]; i++)
+        if (strcmp (names[i], "type") == 0)
+          data->column_type_names = g_slist_prepend (data->column_type_names,
+                                                     g_strdup (values[i]));
+    }
   else if (strcmp (element_name, "columns") == 0)
     ;
   else if (strcmp (element_name, "data") == 0)