gtk+ r19370 - in trunk: . gdk

[mitch svn gnome org]

Author: mitch
Date: Mon Jan 14 15:00:57 2008
New Revision: 19370
URL: http://svn.gnome.org/viewvc/gtk+?rev=19370&view=rev

Log:
2008-01-14  Michael Natterer  <mitch imendio com>

	* gdk/gdkscreen.c (gdk_screen_get_property): cast the return value
	of gdk_screen_get_font_options() to gpointer to get rid of const
	warning.



Modified:
   trunk/ChangeLog
   trunk/gdk/gdkscreen.c

Modified: trunk/gdk/gdkscreen.c
==============================================================================
--- trunk/gdk/gdkscreen.c	(original)
+++ trunk/gdk/gdkscreen.c	Mon Jan 14 15:00:57 2008
@@ -506,7 +506,7 @@
   switch (prop_id)
     {
     case PROP_FONT_OPTIONS:
-      g_value_set_pointer (value, gdk_screen_get_font_options (screen));
+      g_value_set_pointer (value, (gpointer) gdk_screen_get_font_options (screen));
       break;
     case PROP_RESOLUTION:
       g_value_set_double (value, gdk_screen_get_resolution (screen));