seed r529 - in trunk: examples/lightsoff libseed

[racarr svn gnome org]

Author: racarr
Date: Sun Dec 21 06:00:43 2008
New Revision: 529
URL: http://svn.gnome.org/viewvc/seed?rev=529&view=rev

Log:
Fix mixup where _INITIALLY_UNOWNED but not floating objects would lose
one reference introduced a few commits ago.

Modified:
   trunk/examples/lightsoff/board.js
   trunk/examples/lightsoff/light.js
   trunk/libseed/seed-engine.c

Modified: trunk/examples/lightsoff/board.js
==============================================================================
--- trunk/examples/lightsoff/board.js	(original)
+++ trunk/examples/lightsoff/board.js	Sun Dec 21 06:00:43 2008
@@ -116,7 +116,6 @@
 	var y = light.light_y;
 	
 	var fadeline = new Clutter.Timeline({num_frames: 20});
-	Seed.print(fadeline.__debug_ref_count());
 	
 	light.flip(fadeline);
 	

Modified: trunk/examples/lightsoff/light.js
==============================================================================
--- trunk/examples/lightsoff/light.js	(original)
+++ trunk/examples/lightsoff/light.js	Sun Dec 21 06:00:43 2008
@@ -33,9 +33,7 @@
 			
 			Clutter.effect_fade(effect, this.on, this.state * 255);
 			Clutter.effect_scale(effect, this, this.state?1:.9, this.state?1:.9);
-		
-		    this.opacity = this.state * 255;
-			
+
 			return true;
 		}
     },

Modified: trunk/libseed/seed-engine.c
==============================================================================
--- trunk/libseed/seed-engine.c	(original)
+++ trunk/libseed/seed-engine.c	Sun Dec 21 06:00:43 2008
@@ -192,8 +192,7 @@
 
 	gobject = g_object_newv(type, nparams, params);
 
-	sunk = g_object_is_floating(gobject);
-	if (sunk)
+	if (G_IS_INITIALLY_UNOWNED(gobject))
 		g_object_ref_sink(gobject);
 
 	if (!gobject)
@@ -207,8 +206,8 @@
 		g_free((gchar *)params[i].name);
 	}
 
-	// Give up ref
-	g_object_unref(gobject);
+	if (G_IS_INITIALLY_UNOWNED(gobject))
+		g_object_unref(gobject);
 
 	g_type_class_unref(oclass);