AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid a crash when setting a tooltip on a GtkCalendar

Browse Source 
The details code was assuming that it controls ::has-tooltip.
Reported by Bill Nottingham, bug 607344.
This commit is contained in:
Matthias Clasen 2010-02-08 21:18:13 -05:00 committed by Tristan Van Berkom
parent 6247ef7a32
commit 9983f2e551
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkcalendar.c
View File

@ -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);