Commit 412beb44 authored by Matthias Clasen's avatar Matthias Clasen

Avoid a crash when setting a tooltip on a GtkCalendar

The details code was assuming that it controls ::has-tooltip.
Reported by Bill Nottingham, bug 607344.
parent beddf67e
......@@ -1679,6 +1679,9 @@ gtk_calendar_get_detail (GtkCalendar *calendar,
GtkCalendarPrivate *priv = GTK_CALENDAR_GET_PRIVATE (calendar);
gint year, month;
if (priv->detail_func == NULL)
return NULL;
year = calendar->year;
month = calendar->month + calendar->day_month[row][column] - MONTH_CURRENT;
......@@ -2494,10 +2497,7 @@ calendar_paint_day (GtkCalendar *calendar,
/* Get extra information to show, if any: */
if (priv->detail_func)
detail = gtk_calendar_get_detail (calendar, row, col);
else
detail = NULL;
detail = gtk_calendar_get_detail (calendar, row, col);
layout = gtk_widget_create_pango_layout (widget, buffer);
pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment