gtk+ r19431 - in trunk: . gtk tests

[mitch svn gnome org]

Author: mitch
Date: Wed Jan 30 15:06:06 2008
New Revision: 19431
URL: http://svn.gnome.org/viewvc/gtk+?rev=19431&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkbuilderparser.c
   trunk/gtk/updateiconcache.c
   trunk/tests/testcalendar.c

Modified: trunk/gtk/gtkbuilderparser.c
==============================================================================
--- trunk/gtk/gtkbuilderparser.c	(original)
+++ trunk/gtk/gtkbuilderparser.c	Wed Jan 30 15:06:06 2008
@@ -636,7 +636,7 @@
 {
   CommonInfo* parent_info;
   GMarkupParser parser;
-  gpointer *subparser_data;
+  gpointer subparser_data;
   GObject *object;
   GObject *child;
 
@@ -671,7 +671,7 @@
 				       child,
 				       element_name,
 				       &parser,
-				       (gpointer*)&subparser_data))
+				       &subparser_data))
     return FALSE;
       
   data->subparser = create_subparser (object, child, element_name,

Modified: trunk/gtk/updateiconcache.c
==============================================================================
--- trunk/gtk/updateiconcache.c	(original)
+++ trunk/gtk/updateiconcache.c	Wed Jan 30 15:06:06 2008
@@ -744,7 +744,7 @@
 static void
 add_string (const gchar *n, int offset)
 {
-  g_hash_table_insert (string_pool, n, GINT_TO_POINTER (offset));
+  g_hash_table_insert (string_pool, (gpointer) n, GINT_TO_POINTER (offset));
 }
 
 static gboolean

Modified: trunk/tests/testcalendar.c
==============================================================================
--- trunk/tests/testcalendar.c	(original)
+++ trunk/tests/testcalendar.c	Wed Jan 30 15:06:06 2008
@@ -105,7 +105,7 @@
 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 @@
   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 @@
 	}
 }
 
-static G_CONST_RETURN gchar*
+static gchar*
 calendar_detail_cb (GtkCalendar *calendar,
                     guint        year,
                     guint        month,