cast the return value of gdk_screen_get_font_options() to gpointer to get

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.

svn path=/trunk/; revision=19370

diff --git a/ChangeLog b/ChangeLog
index 407c60b272cf3d09492bf76faf03f99023785ddb..88bd5934d85875bea109854502782bad46cce971 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2008-01-14  Michael Natterer  <mitch@imendio.com>
 
        * tests/testdnd.c (source_drag_data_get): fix another call to

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 72aa3f731348020a99646bbd0cb09c4c48c0faa9..3695973c53d4104e25e576d34dbc1654ec6448b0 100644 (file)
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -506,7 +506,7 @@ gdk_screen_get_property (GObject      *object,
   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));