From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 16 Feb 2009 16:49:21 +0000 (+0000)
Subject: only use g_value_set_pointer if the GType of a class is G_TYPE_POINTER;
X-Git-Tag: 0.5.7~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f0ef39fadb701499ee9a8d00a21b527c0ba0eb8;p=thirdparty%2Fvala.git

only use g_value_set_pointer if the GType of a class is G_TYPE_POINTER;

2009-02-16  Ryan Lortie  <desrt@desrt.ca>

        * vala/valaclass.vala: only use g_value_set_pointer if the GType of a
        class is G_TYPE_POINTER; else use g_value_set_boxed.


svn path=/trunk/; revision=2445
---

diff --git a/ChangeLog b/ChangeLog
index 51b372363..1e9272f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-16  Ryan Lortie  <desrt@desrt.ca>
+
+	* vala/valaclass.vala: only use g_value_set_pointer if the GType of a
+	class is G_TYPE_POINTER; else use g_value_set_boxed.
+
 2009-02-16  Ryan Lortie  <desrt@desrt.ca>
 
 	* gobject/valagasyncmodule.vala: remove the dummy-object hack since
diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index 6cece1ffd..a32abfc23 100644
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -718,8 +718,10 @@ public class Vala.Class : ObjectTypeSymbol {
 				get_value_function = get_lower_case_cname ("value_get_");
 			} else if (base_class != null) {
 				get_value_function = base_class.get_get_value_function ();
-			} else {
+			} else if (get_type_id () == "G_TYPE_POINTER") {
 				get_value_function = "g_value_get_pointer";
+			} else {
+				get_value_function = "g_value_get_boxed";
 			}
 		}
 
@@ -732,8 +734,10 @@ public class Vala.Class : ObjectTypeSymbol {
 				set_value_function = get_lower_case_cname ("value_set_");
 			} else if (base_class != null) {
 				set_value_function = base_class.get_set_value_function ();
-			} else {
+			} else if (get_type_id () == "G_TYPE_POINTER") {
 				set_value_function = "g_value_set_pointer";
+			} else {
+				set_value_function = "g_value_set_boxed";
 			}
 		}
 
@@ -1112,3 +1116,4 @@ public class Vala.Class : ObjectTypeSymbol {
 	}
 }
 
+// vim:sw=8 noet