use the right type for "subparser_data" and remove the (gpointer*) cast.
2008-01-30 Michael Natterer <mitch@imendio.com> * gtk/gtkbuilderparser.c (parse_custom): use the right type for "subparser_data" and remove the (gpointer*) cast. Fixes bogus aliasing warning. * gtk/updateiconcache.c (add_string): cast const gchar* to gpointer when inserting in a GHashTable. * tests/testcalendar.c (calendar_detail_cb): remove const from return value since it's a newly allocated string. (calendar_update_details): free the detail. svn path=/trunk/; revision=19431
This commit is contained in:
committed by
Michael Natterer
parent
8a1723bccc
commit
63af2cd041
@ -105,7 +105,7 @@ static void
|
||||
calendar_update_details (CalendarData *data)
|
||||
{
|
||||
guint year, month, day;
|
||||
const gchar *detail;
|
||||
gchar *detail;
|
||||
|
||||
gtk_calendar_get_date (GTK_CALENDAR (data->calendar_widget), &year, &month, &day);
|
||||
detail = calendar_get_detail (data, year, month, day);
|
||||
@ -113,6 +113,8 @@ calendar_update_details (CalendarData *data)
|
||||
g_signal_handler_block (data->details_buffer, data->details_changed);
|
||||
gtk_text_buffer_set_text (data->details_buffer, detail ? detail : "", -1);
|
||||
g_signal_handler_unblock (data->details_buffer, data->details_changed);
|
||||
|
||||
g_free (detail);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -257,7 +259,7 @@ void calendar_select_font (GtkWidget *button,
|
||||
}
|
||||
}
|
||||
|
||||
static G_CONST_RETURN gchar*
|
||||
static gchar*
|
||||
calendar_detail_cb (GtkCalendar *calendar,
|
||||
guint year,
|
||||
guint month,
|
||||
|
||||
Reference in New Issue
Block a user