From: Jürg Billeter <j@bitron.ch>
Date: Thu, 15 Jan 2009 11:26:07 +0000 (+0000)
Subject: Fix generated introspection information when using DBus.BusName sender
X-Git-Tag: VALA_0_5_6~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac810aef907f3e677428eca4ba0270264c37fab6;p=thirdparty%2Fvala.git

Fix generated introspection information when using DBus.BusName sender

2009-01-15  Jürg Billeter  <j@bitron.ch>

	* gobject/valadbusservermodule.vala:

	Fix generated introspection information when using DBus.BusName
	sender parameter

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

diff --git a/ChangeLog b/ChangeLog
index 90af4f244..04830336c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-15  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valadbusservermodule.vala:
+
+	Fix generated introspection information when using DBus.BusName
+	sender parameter
+
 2009-01-15  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valaparser.vala:
diff --git a/gobject/valadbusservermodule.vala b/gobject/valadbusservermodule.vala
index c7b6ab662..47deca3ee 100644
--- a/gobject/valadbusservermodule.vala
+++ b/gobject/valadbusservermodule.vala
@@ -1,6 +1,6 @@
 /* valadbusservermodule.vala
  *
- * Copyright (C) 2007-2008  Jürg Billeter
+ * Copyright (C) 2007-2009  Jürg Billeter
 *  Copyright (C) 2008  Philip Van Hoof
  *
  * This library is free software; you can redistribute it and/or
@@ -909,6 +909,13 @@ public class Vala.DBusServerModule : DBusClientModule {
 			result += "  <method name=\"%s\">\n".printf (Symbol.lower_case_to_camel_case (m.name));
 
 			foreach (var param in m.get_parameters ()) {
+				if (param.parameter_type.data_type != null
+				    && param.parameter_type.data_type.get_full_name () == "DBus.BusName") {
+					// skip sender parameter
+					// (implicit in D-Bus)
+					continue;
+				}
+
 				string direction = param.direction == ParameterDirection.IN ? "in" : "out";
 				result += "    <arg name=\"%s\" type=\"%s\" direction=\"%s\"/>\n".printf (param.name, param.parameter_type.get_type_signature (), direction);
 			}