gtk+ r20789 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Jul  6 06:08:48 2008
New Revision: 20789
URL: http://svn.gnome.org/viewvc/gtk+?rev=20789&view=rev

Log:
2008-07-06  Matthias Clasen  <mclasen redhat com>

        Bug 539248 â gtk_calender_query_tooltip calls ->detail_func with
        invalid dates

        * gtk/gtkcalendar.c (gtk_calendar_query_tooltip):
        Check that the cursor is over a valid date before retrieving
        its details.  Patch by Chris Wilson



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcalendar.c

Modified: trunk/gtk/gtkcalendar.c
==============================================================================
--- trunk/gtk/gtkcalendar.c	(original)
+++ trunk/gtk/gtkcalendar.c	Sun Jul  6 06:08:48 2008
@@ -1711,8 +1711,9 @@
       col = calendar_column_from_x (calendar, x - x0);
       row = calendar_row_from_y (calendar, y - y0);
 
-      if (0 != (priv->detail_overflow[row] & (1 << col)) ||
-          0 == (calendar->display_flags & GTK_CALENDAR_SHOW_DETAILS))
+      if (col != -1 && row != -1 &&
+          (0 != (priv->detail_overflow[row] & (1 << col)) ||
+           0 == (calendar->display_flags & GTK_CALENDAR_SHOW_DETAILS)))
         {
           detail = gtk_calendar_get_detail (calendar, row, col);
           calendar_day_rectangle (calendar, row, col, &day_rect);