Change FSF Address

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

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index a1a91c24ad3935c3be4516de3d2fa1dc4692ab3e..1c6d63638b3deee56076a81e2d238a191933b9b2 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -12,9 +12,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -25,6 +23,7 @@
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
+#include "gtkdebug.h"
 #include "gtkintl.h"
 
 
@@ -303,11 +302,11 @@ gtk_tree_store_init (GtkTreeStore *tree_store)
 /**
  * gtk_tree_store_new:
  * @n_columns: number of columns in the tree store
- * @Varargs: all #GType types for the columns, from first to last
+ * @...: all #GType types for the columns, from first to last
  *
  * Creates a new tree store as with @n_columns columns each of the types passed
- * in.  Note that only types derived from standard GObject fundamental types 
- * are supported. 
+ * 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,
  * GDK_TYPE_PIXBUF);</literal> will create a new #GtkTreeStore with three columns, of type
@@ -559,13 +558,19 @@ gtk_tree_store_get_iter (GtkTreeModel *tree_model,
   parent.user_data = priv->root;
 
   if (!gtk_tree_store_iter_nth_child (tree_model, iter, &parent, indices[0]))
-    return FALSE;
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
 
   for (i = 1; i < depth; i++)
     {
       parent = *iter;
       if (!gtk_tree_store_iter_nth_child (tree_model, iter, &parent, indices[i]))
-       return FALSE;
+        {
+          iter->stamp = 0;
+          return FALSE;
+        }
     }
 
   return TRUE;
@@ -842,7 +847,7 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
   gint old_column = column;
-  GValue real_value = { 0, };
+  GValue real_value = G_VALUE_INIT;
   gboolean converted = FALSE;
   gboolean retval = FALSE;
 
@@ -1033,7 +1038,7 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
 
   while (column != -1)
     {
-      GValue value = { 0, };
+      GValue value = G_VALUE_INIT;
       gchar *error = NULL;
 
       if (column < 0 || column >= priv->n_columns)
@@ -1163,13 +1168,13 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
  * gtk_tree_store_set:
  * @tree_store: A #GtkTreeStore
  * @iter: A valid #GtkTreeIter for the row being modified
- * @Varargs: pairs of column number and value, terminated with -1
+ * @...: pairs of column number and value, terminated with -1
  *
  * Sets the value of one or more cells in the row referenced by @iter.
  * The variable argument list should contain integer column numbers,
- * each column number followed by the value to be set. 
+ * each column number followed by the value to be set.
  * The list is terminated by a -1. For example, to set column 0 with type
- * %G_TYPE_STRING to "Foo", you would write 
+ * %G_TYPE_STRING to "Foo", you would write
  * <literal>gtk_tree_store_set (store, iter, 0, "Foo", -1)</literal>.
  *
  * The value will be referenced by the store if it is a %G_TYPE_OBJECT, and it
@@ -1486,11 +1491,11 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store,
  * @iter: (out) (allow-none): An unset #GtkTreeIter to set the new row, or %NULL.
  * @parent: (allow-none): A valid #GtkTreeIter, or %NULL
  * @position: position to insert the new row
- * @Varargs: pairs of column number and value, terminated with -1
+ * @...: pairs of column number and value, terminated with -1
  *
- * 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 filled with
+ * 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 filled with
  * the values given to this function.
  *
  * Calling