gtk+ r22091 - in branches/gtk-2-14: . gtk

[csaavedra svn gnome org]

Author: csaavedra
Date: Mon Jan 12 09:59:41 2009
New Revision: 22091
URL: http://svn.gnome.org/viewvc/gtk+?rev=22091&view=rev

Log:
2009-01-12  Claudio Saavedra  <csaavedra igalia com>

	Bug 567468 â no check for trailing != NULL in
	gtk_text_layout_get_iter_at_position()

	* gtk/gtktextlayout.c: (gtk_text_layout_get_iter_at_position):
	Check for trailing to be non-NULL.
	* gtk/gtktextview.c: (gtk_text_view_get_iter_at_position): document
	that trailing may be NULL.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtktextlayout.c
   branches/gtk-2-14/gtk/gtktextview.c

Modified: branches/gtk-2-14/gtk/gtktextlayout.c
==============================================================================
--- branches/gtk-2-14/gtk/gtktextlayout.c	(original)
+++ branches/gtk-2-14/gtk/gtktextlayout.c	Mon Jan 12 09:59:41 2009
@@ -2654,7 +2654,8 @@
   if (y > display->height - display->top_margin - display->bottom_margin)
     {
       byte_index = _gtk_text_line_byte_count (line);
-      *trailing = 0;
+      if (trailing)
+        *trailing = 0;
     }
   else
     {

Modified: branches/gtk-2-14/gtk/gtktextview.c
==============================================================================
--- branches/gtk-2-14/gtk/gtktextview.c	(original)
+++ branches/gtk-2-14/gtk/gtktextview.c	Mon Jan 12 09:59:41 2009
@@ -1465,7 +1465,7 @@
  * gtk_text_view_get_iter_at_position:
  * @text_view: a #GtkTextView
  * @iter: a #GtkTextIter
- * @trailing: location to store an integer indicating where
+ * @trailing: if non-%NULL, location to store an integer indicating where
  *    in the grapheme the user clicked. It will either be
  *    zero, or the number of characters in the grapheme. 
  *    0 represents the trailing edge of the grapheme.