From: Jürg Billeter <j@bitron.ch>
Date: Mon, 3 Nov 2008 21:44:16 +0000 (+0000)
Subject: Move dbus_use_ptr_array to DBusClientModule
X-Git-Tag: VALA_0_5_1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed2aeb353d3814987ff2d2abd11675389021a42a;p=thirdparty%2Fvala.git

Move dbus_use_ptr_array to DBusClientModule

2008-11-03  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodebasemodule.vala:
	* gobject/valadbusclientmodule.vala:

	Move dbus_use_ptr_array to DBusClientModule

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

diff --git a/ChangeLog b/ChangeLog
index 720426eca..dd2fcd5ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-03  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodebasemodule.vala:
+	* gobject/valadbusclientmodule.vala:
+
+	Move dbus_use_ptr_array to DBusClientModule
+
 2008-11-03  Jürg Billeter  <j@bitron.ch>
 
 	* gobject/Makefile.am:
diff --git a/gobject/valaccodebasemodule.vala b/gobject/valaccodebasemodule.vala
index 7b4c75b1b..d0c007b06 100644
--- a/gobject/valaccodebasemodule.vala
+++ b/gobject/valaccodebasemodule.vala
@@ -4193,32 +4193,6 @@ public class Vala.CCodeBaseModule : CCodeModule {
 		}
 	}
 
-	public bool dbus_use_ptr_array (ArrayType array_type) {
-		if (array_type.element_type.data_type == string_type.data_type) {
-			// use char**
-			return false;
-		} else if (array_type.element_type.data_type == bool_type.data_type
-		           || array_type.element_type.data_type == char_type.data_type
-		           || array_type.element_type.data_type == uchar_type.data_type
-		           || array_type.element_type.data_type == int_type.data_type
-		           || array_type.element_type.data_type == uint_type.data_type
-		           || array_type.element_type.data_type == long_type.data_type
-		           || array_type.element_type.data_type == ulong_type.data_type
-		           || array_type.element_type.data_type == int8_type.data_type
-		           || array_type.element_type.data_type == uint8_type.data_type
-		           || array_type.element_type.data_type == int32_type.data_type
-		           || array_type.element_type.data_type == uint32_type.data_type
-		           || array_type.element_type.data_type == int64_type.data_type
-		           || array_type.element_type.data_type == uint64_type.data_type
-		           || array_type.element_type.data_type == double_type.data_type) {
-			// use GArray
-			return false;
-		} else {
-			// use GPtrArray
-			return true;
-		}
-	}
-
 	public CCodeNode? get_ccodenode (CodeNode node) {
 		if (node.ccodenode == null) {
 			node.accept (codegen);
diff --git a/gobject/valadbusclientmodule.vala b/gobject/valadbusclientmodule.vala
index 03b87d747..ae9415df2 100644
--- a/gobject/valadbusclientmodule.vala
+++ b/gobject/valadbusclientmodule.vala
@@ -476,4 +476,30 @@ public class Vala.DBusClientModule : GAsyncModule {
 			return new CCodeIdentifier (data_type.data_type.get_type_id ());
 		}
 	}
+
+	public bool dbus_use_ptr_array (ArrayType array_type) {
+		if (array_type.element_type.data_type == string_type.data_type) {
+			// use char**
+			return false;
+		} else if (array_type.element_type.data_type == bool_type.data_type
+		           || array_type.element_type.data_type == char_type.data_type
+		           || array_type.element_type.data_type == uchar_type.data_type
+		           || array_type.element_type.data_type == int_type.data_type
+		           || array_type.element_type.data_type == uint_type.data_type
+		           || array_type.element_type.data_type == long_type.data_type
+		           || array_type.element_type.data_type == ulong_type.data_type
+		           || array_type.element_type.data_type == int8_type.data_type
+		           || array_type.element_type.data_type == uint8_type.data_type
+		           || array_type.element_type.data_type == int32_type.data_type
+		           || array_type.element_type.data_type == uint32_type.data_type
+		           || array_type.element_type.data_type == int64_type.data_type
+		           || array_type.element_type.data_type == uint64_type.data_type
+		           || array_type.element_type.data_type == double_type.data_type) {
+			// use GArray
+			return false;
+		} else {
+			// use GPtrArray
+			return true;
+		}
+	}
 }