Fix the nul_dbus_function_t type

3 files changed, 22 insertions, 22 deletions

diff --git a/dbus.c b/dbus.c
index 9d778a6..061fc43 100644
--- a/dbus.c
+++ b/dbus.c
@@ -56,7 +56,7 @@ struct nul_dbus_member_t
      */
     nul_dbus_interface_t *	interface;	/* containing interface */
     
-    nul_dbus_Function		function;
+    nul_dbus_function_t		function;
     
     GPtrArray *		parameters;
     int			n_inputs;
@@ -847,7 +847,7 @@ nul_dbus_object (const char *name,
 			 "org.freedesktop.DBus.Introspectable",
 			 nul_dbus_method (
 			     "Introspect",
-			     (nul_dbus_Function)NULL,
+			     (nul_dbus_function_t)NULL,
 			     nul_dbus_parameter_out (
 				 "data",
 				 nul_dbus_type_string()),
@@ -958,7 +958,7 @@ make_reply_fun (nul_dbus_member_t *member)
 
 nul_dbus_member_t *
 nul_dbus_method (const char *name,
-	    nul_dbus_Function function,
+	    nul_dbus_function_t function,
 	    nul_dbus_parameter_t *parameter1,
 	    ...)
 {
@@ -1059,7 +1059,7 @@ nul_dbus_type_string (void)
 
 typedef struct
 {
-    nul_dbus_Function callback;
+    nul_dbus_function_t callback;
     gpointer data;
     nul_dbus_member_t *method;
 } InvokeInfo;
@@ -1181,7 +1181,7 @@ find_member (nul_dbus_interface_t *interface, const char *name)
 void
 nul_dbus_invoke (nul_dbus_service_t *service,
 	    const char *method_desc,
-	    nul_dbus_Function callback,
+	    nul_dbus_function_t callback,
 	    gpointer data,
 	    ...)
 {
diff --git a/dbw-example.c b/dbw-example.c
index 2270f4e..66759da 100644
--- a/dbw-example.c
+++ b/dbw-example.c
@@ -67,7 +67,7 @@ make_service1 (void)
 		
 		nul_dbus_method (
 		    "do_stuff",
-		    (nul_dbus_Function)on_do_stuff,
+		    (nul_dbus_function_t)on_do_stuff,
 		    nul_dbus_parameter_in ("birnan", nul_dbus_type_int32()),
 		    nul_dbus_parameter_in ("fish", nul_dbus_type_uint32()),
 		    nul_dbus_parameter_out ("emfle", nul_dbus_type_string()),
@@ -76,7 +76,7 @@ make_service1 (void)
 		
 		nul_dbus_method (
 		    "another_method",
-		    (nul_dbus_Function)on_another_method,
+		    (nul_dbus_function_t)on_another_method,
 		    nul_dbus_parameter_in ("n_times", nul_dbus_type_uint32()),
 		    NULL),
 		
@@ -102,7 +102,7 @@ make_service2 (void)
 		
 		nul_dbus_method (
 		    "load_image",
-		    (nul_dbus_Function)load_image,
+		    (nul_dbus_function_t)load_image,
 		    nul_dbus_parameter_in ("image", nul_dbus_type_string()),
 		    nul_dbus_parameter_out ("result", nul_dbus_type_int32()),
 		    NULL),
@@ -130,7 +130,7 @@ on_reply (int result, const GError *err, nul_dbus_service_t *service)
 
     nul_dbus_invoke (service,
 		"/com/ssp/whatever/birnan/emfle/com.ssp.interface.do_stuff",
-		(nul_dbus_Function)on_do_stuff_reply, NULL,
+		(nul_dbus_function_t)on_do_stuff_reply, NULL,
 		100, 200);
 }
 
@@ -155,7 +155,7 @@ invokes (gpointer data)
 
 	nul_dbus_invoke (service2,
 		    "/org/gnome/siv/org.gnome.siv.load_image",
-		    (nul_dbus_Function)on_reply, service,
+		    (nul_dbus_function_t)on_reply, service,
 		    "LOLCAT.PNG");
     }
 
diff --git a/libnul.h b/libnul.h
index de10817..009268c 100644
--- a/libnul.h
+++ b/libnul.h
@@ -121,26 +121,26 @@ typedef struct nul_dbus_parameter_t nul_dbus_parameter_t;
 typedef struct nul_dbus_arg_t nul_dbus_arg_t;
 
 /* Return TRUE for handled, FALSE for not handled */
-typedef gboolean (* nul_dbus_Function) ();
+typedef gboolean (* nul_dbus_function_t) ();
 
 nul_dbus_service_t *  nul_dbus_session_service (const char    *name,
 						nul_dbus_object_t     *object1,
 						...);
 nul_dbus_object_t *   nul_dbus_object          (const char    *name,
-					      gpointer       data,
-					      nul_dbus_interface_t  *interface1,
-					      ...);
+						gpointer       data,
+						nul_dbus_interface_t  *interface1,
+						...);
 nul_dbus_interface_t *nul_dbus_interface       (const char    *name,
-					      nul_dbus_member_t     *member1,
-					      ...);
+						nul_dbus_member_t     *member1,
+						...);
 nul_dbus_member_t *   nul_dbus_method          (const char    *name,
-					      nul_dbus_Function    function,
-					      nul_dbus_parameter_t  *parameter1,
-					      ...);
+						nul_dbus_function_t    function,
+						nul_dbus_parameter_t  *parameter1,
+						...);
 nul_dbus_parameter_t *nul_dbus_parameter_in    (const char    *name,
-					      const nul_dbus_type_t *type);
+						const nul_dbus_type_t *type);
 nul_dbus_parameter_t *nul_dbus_parameter_out   (const char    *name,
-					      const nul_dbus_type_t *type);
+						const nul_dbus_type_t *type);
 gboolean              nul_dbus_service_start   (nul_dbus_service_t *service);
 void                  nul_dbus_service_stop    (nul_dbus_service_t *service);
 
@@ -160,7 +160,7 @@ nul_dbus_Proxy *nul_dbus_proxy_new_session_service (const char *bus_name,
 
 void nul_dbus_invoke (nul_dbus_service_t *service,
 		      const char *method_desc,
-		      nul_dbus_Function callback,
+		      nul_dbus_function_t callback,
 		      gpointer data,
 		      ...);