[gtk+/native-layout] Avoid a crash when setting a tooltip on a GtkCalendar
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Avoid a crash when setting a tooltip on a GtkCalendar
- Date: Sun, 4 Apr 2010 02:26:00 +0000 (UTC)
commit 9983f2e551fa0d0cdf8e2aaa8dc105c90b188a2b
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Feb 8 21:18:13 2010 -0500
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.
gtk/gtkcalendar.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 8bc6e63..13488e5 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]