diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-07-06 06:08:48 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-06 06:08:48 +0000 |
| commit | e36dd2f4e3df550c94bd8379f7b14a431d31a746 (patch) | |
| tree | 333170802bb44c5d983e4678ba02fdc436e7dc6b | |
| parent | 486d65659f747c1d98e9eb6dd07cfae4758d2b9d (diff) | |
| download | gtk+-e36dd2f4e3df550c94bd8379f7b14a431d31a746.tar.gz | |
Bug 539248 – gtk_calender_query_tooltip calls ->detail_func with invalid
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
svn path=/trunk/; revision=20789
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkcalendar.c | 5 |
2 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,14 @@ 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 + +2008-07-06 Matthias Clasen <mclasen@redhat.com> + Bug 493008 – gdk_screen_get_window_stack is not 64-bit-compatible * gdk/x11/gdkscreen-x11.c (gdk_screen_get_window_stack): Fix diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 29f786717a..a1c73bb22e 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -1711,8 +1711,9 @@ gtk_calendar_query_tooltip (GtkWidget *widget, 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); |