X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextiter.c;h=2b41c34cfbb3b84eb03249a564bc8bc102f357b5;hb=9d81b69e06cd9c2ad9cb5204056bfae5a3128e9c;hp=6ee68bd83b6e48db8c3e9cb0084776e94dd0eed8;hpb=794e0446e94f8d0f994cda4eae47c89370e3141c;p=~andy%2Fgtk

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 6ee68bd83..2b41c34cf 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser 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/>.
  */
 
 /*
@@ -444,6 +442,28 @@ gtk_text_iter_free (GtkTextIter *iter)
   g_slice_free (GtkTextIter, iter);
 }
 
+/**
+ * gtk_text_iter_assign:
+ * @iter: a #GtkTextIter
+ * @other: another #GtkTextIter
+ *
+ * Assigns the value of @other to @iter.  This function
+ * is not useful in applications, because iterators can be assigned
+ * with <literal>GtkTextIter i = j;</literal>. The
+ * function is used by language bindings.
+ *
+ * Since: 3.2
+ **/
+void
+gtk_text_iter_assign (GtkTextIter       *iter,
+                      const GtkTextIter *other)
+{
+  g_return_if_fail (iter != NULL);
+  g_return_if_fail (other != NULL);
+
+  *iter = *other;
+}
+
 G_DEFINE_BOXED_TYPE (GtkTextIter, gtk_text_iter,
                      gtk_text_iter_copy,
                      gtk_text_iter_free)
@@ -1717,7 +1737,7 @@ gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter)
 /**
  * gtk_text_iter_get_attributes:
  * @iter: an iterator
- * @values: a #GtkTextAttributes to be filled in
+ * @values: (out): a #GtkTextAttributes to be filled in
  *
  * Computes the effect of any tags applied to this spot in the
  * text. The @values parameter should be initialized to the default
@@ -2452,7 +2472,7 @@ gtk_text_iter_forward_text_chars  (GtkTextIter *iter,
 }
 
 /**
- * gtk_text_iter_forward_text_chars:
+ * gtk_text_iter_backward_text_chars:
  * @iter: a #GtkTextIter
  * @count: number of chars to move
  *
@@ -4476,7 +4496,7 @@ exact_prefix_cmp (const gchar *string,
   /* If string contains prefix, check that prefix is not followed
    * by a unicode mark symbol, e.g. that trailing 'a' in prefix
    * is not part of two-char a-with-hat symbol in string. */
-  return type != G_UNICODE_COMBINING_MARK &&
+  return type != G_UNICODE_SPACING_MARK &&
          type != G_UNICODE_ENCLOSING_MARK &&
          type != G_UNICODE_NON_SPACING_MARK;
 }