gnome-games r8508 - trunk/aisleriot

[chpe svn gnome org]

Author: chpe
Date: Tue Jan  6 18:20:47 2009
New Revision: 8508
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8508&view=rev

Log:
Build with clutter 0.8.

Modified:
   trunk/aisleriot/card.c
   trunk/aisleriot/slot-renderer.c

Modified: trunk/aisleriot/card.c
==============================================================================
--- trunk/aisleriot/card.c	(original)
+++ trunk/aisleriot/card.c	Tue Jan  6 18:20:47 2009
@@ -130,6 +130,7 @@
                                 G_PARAM_STATIC_BLURB);
   g_object_class_install_property (gobject_class, PROP_HIGHLIGHTED, pspec);
 
+#if 0
   pspec = clutter_param_spec_color ("highlight-color", NULL, NULL,
                                     &default_highlight_color,
                                     G_PARAM_WRITABLE |
@@ -137,6 +138,15 @@
                                     G_PARAM_STATIC_NICK |
                                     G_PARAM_STATIC_BLURB |
                                     G_PARAM_CONSTRUCT);
+#else
+  pspec = g_param_spec_boxed ("highlight-color", NULL, NULL,
+                              CLUTTER_TYPE_COLOR,
+                              G_PARAM_WRITABLE |
+                              G_PARAM_STATIC_NAME |
+                              G_PARAM_STATIC_NICK |
+                              G_PARAM_STATIC_BLURB |
+                              G_PARAM_CONSTRUCT);
+#endif
   g_object_class_install_property (gobject_class, PROP_HIGHLIGHT_COLOR, pspec);
 
   g_type_class_add_private (klass, sizeof (AisleriotCardPrivate));

Modified: trunk/aisleriot/slot-renderer.c
==============================================================================
--- trunk/aisleriot/slot-renderer.c	(original)
+++ trunk/aisleriot/slot-renderer.c	Tue Jan  6 18:20:47 2009
@@ -136,15 +136,22 @@
   g_object_class_install_property (gobject_class, PROP_HIGHLIGHT, pspec);
 
 
-  /* Don't make this CONSTRUCT, since older clutter 0.8.x releases
-   * have a bug with that leading to an invalid free.
-   */
+#if 0
   pspec = clutter_param_spec_color ("highlight-color", NULL, NULL,
                                     &default_highlight_color,
                                     G_PARAM_WRITABLE |
                                     G_PARAM_STATIC_NAME |
                                     G_PARAM_STATIC_NICK |
-                                    G_PARAM_STATIC_BLURB);
+                                    G_PARAM_STATIC_BLURB |
+                                    G_PARAM_CONSTRUCT);
+#else
+  pspec = g_param_spec_boxed ("highlight-color", NULL, NULL,
+                              CLUTTER_TYPE_COLOR,
+                              G_PARAM_WRITABLE |
+                              G_PARAM_STATIC_NAME |
+                              G_PARAM_STATIC_NICK |
+                              G_PARAM_STATIC_BLURB);
+#endif
   g_object_class_install_property (gobject_class, PROP_HIGHLIGHT_COLOR, pspec);
 
   pspec = g_param_spec_int ("revealed-card", NULL, NULL,