From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 29 Jun 2010 03:31:49 +0000 (-0400)
Subject: D-Bus: fix function signature for object vtable
X-Git-Tag: 0.9.3~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02bb49fcf2062481af07ebd32c4389438377eb0a;p=thirdparty%2Fvala.git

D-Bus: fix function signature for object vtable

Make the 'user_data' argument for the method call and property get/set
functions for GDBus services have the proper 'gpointer' type instead of
'gpointer*'.  Also the GDestroyNotify.
---

diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala
index 4c4a069d3..1864a1a98 100644
--- a/codegen/valagdbusservermodule.vala
+++ b/codegen/valagdbusservermodule.vala
@@ -617,7 +617,7 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 		cfunc.add_parameter (new CCodeFormalParameter ("method_name", "const gchar*"));
 		cfunc.add_parameter (new CCodeFormalParameter ("parameters", "GVariant*"));
 		cfunc.add_parameter (new CCodeFormalParameter ("invocation", "GDBusMethodInvocation*"));
-		cfunc.add_parameter (new CCodeFormalParameter ("data", "gpointer*"));
+		cfunc.add_parameter (new CCodeFormalParameter ("user_data", "gpointer"));
 
 		cfunc.modifiers |= CCodeModifiers.STATIC;
 
@@ -626,7 +626,11 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 		var block = new CCodeBlock ();
 		cfunc.block = block;
 
-		var cdecl = new CCodeDeclaration ("gpointer");
+		var cdecl = new CCodeDeclaration ("gpointer*");
+		cdecl.add_declarator (new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data")));
+		block.add_statement (cdecl);
+
+		cdecl = new CCodeDeclaration ("gpointer");
 		cdecl.add_declarator (new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0"))));
 		block.add_statement (cdecl);
 
@@ -675,7 +679,7 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 		cfunc.add_parameter (new CCodeFormalParameter ("interface_name", "const gchar*"));
 		cfunc.add_parameter (new CCodeFormalParameter ("property_name", "const gchar*"));
 		cfunc.add_parameter (new CCodeFormalParameter ("error", "GError**"));
-		cfunc.add_parameter (new CCodeFormalParameter ("data", "gpointer*"));
+		cfunc.add_parameter (new CCodeFormalParameter ("user_data", "gpointer"));
 
 		cfunc.modifiers |= CCodeModifiers.STATIC;
 
@@ -684,7 +688,11 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 		var block = new CCodeBlock ();
 		cfunc.block = block;
 
-		var cdecl = new CCodeDeclaration ("gpointer");
+		var cdecl = new CCodeDeclaration ("gpointer*");
+		cdecl.add_declarator (new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data")));
+		block.add_statement (cdecl);
+
+		cdecl = new CCodeDeclaration ("gpointer");
 		cdecl.add_declarator (new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0"))));
 		block.add_statement (cdecl);
 
@@ -737,7 +745,7 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 		cfunc.add_parameter (new CCodeFormalParameter ("property_name", "const gchar*"));
 		cfunc.add_parameter (new CCodeFormalParameter ("value", "GVariant*"));
 		cfunc.add_parameter (new CCodeFormalParameter ("error", "GError**"));
-		cfunc.add_parameter (new CCodeFormalParameter ("data", "gpointer*"));
+		cfunc.add_parameter (new CCodeFormalParameter ("user_data", "gpointer"));
 
 		cfunc.modifiers |= CCodeModifiers.STATIC;
 
@@ -746,7 +754,11 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 		var block = new CCodeBlock ();
 		cfunc.block = block;
 
-		var cdecl = new CCodeDeclaration ("gpointer");
+		var cdecl = new CCodeDeclaration ("gpointer*");
+		cdecl.add_declarator (new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data")));
+		block.add_statement (cdecl);
+
+		cdecl = new CCodeDeclaration ("gpointer");
 		cdecl.add_declarator (new CCodeVariableDeclarator ("object", new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0"))));
 		block.add_statement (cdecl);
 
@@ -1159,13 +1171,17 @@ public class Vala.GDBusServerModule : GDBusClientModule {
 
 
 		cfunc = new CCodeFunction ("_" + sym.get_lower_case_cprefix () + "unregister_object");
-		cfunc.add_parameter (new CCodeFormalParameter ("data", "gpointer*"));
+		cfunc.add_parameter (new CCodeFormalParameter ("user_data", "gpointer"));
 		cfunc.modifiers |= CCodeModifiers.STATIC;
 		source_declarations.add_type_member_declaration (cfunc.copy ());
 
 		block = new CCodeBlock ();
 		cfunc.block = block;
 
+		cdecl = new CCodeDeclaration ("gpointer*");
+		cdecl.add_declarator (new CCodeVariableDeclarator ("data", new CCodeIdentifier ("user_data")));
+		block.add_statement (cdecl);
+
 		var unref_object = new CCodeFunctionCall (new CCodeIdentifier (sym.get_unref_function ()));
 		unref_object.add_argument (new CCodeElementAccess (new CCodeIdentifier ("data"), new CCodeConstant ("0")));
 		block.add_statement (new CCodeExpressionStatement (unref_object));