2003-11-26 Mikael Hallendal <micke@imendio.com>

	* bus/*.[ch]:
	* dbus/*.[ch]:
	* glib/*.[ch]: Made ref functions return the pointer

6 files changed, 35 insertions, 17 deletions

diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c
index 596b43ca..aecdc002 100644
--- a/glib/dbus-gidl.c
+++ b/glib/dbus-gidl.c
@@ -67,13 +67,15 @@ struct ArgInfo
   ArgDirection direction;
 };
 
-void
+BaseInfo *
 base_info_ref (BaseInfo *info)
 {
   g_return_if_fail (info != NULL);
   g_return_if_fail (info->refcount > 0);
   
   info->refcount += 1;
+
+  return info;
 }
 
 static void
@@ -222,10 +224,12 @@ node_info_new (const char *name)
   return info;
 }
 
-void
+NodeInfo *
 node_info_ref (NodeInfo *info)
 {
   info->base.refcount += 1;
+
+  return info;
 }
 
 void
@@ -287,10 +291,12 @@ interface_info_new (const char *name)
   return info;
 }
 
-void
+InterfaceInfo *
 interface_info_ref (InterfaceInfo *info)
 {
   info->base.refcount += 1;
+
+  return info;
 }
 
 void
@@ -366,10 +372,12 @@ method_info_new (const char *name)
   return info;
 }
 
-void
+MethodInfo *
 method_info_ref (MethodInfo *info)
 {
   info->base.refcount += 1;
+
+  return info;
 }
 
 void
@@ -416,10 +424,12 @@ signal_info_new (const char *name)
   return info;
 }
 
-void
+SignalInfo *
 signal_info_ref (SignalInfo *info)
 {
   info->base.refcount += 1;
+
+  return info;
 }
 
 void
@@ -472,10 +482,12 @@ arg_info_new (const char  *name,
   return info;
 }
 
-void
+ArgInfo *
 arg_info_ref (ArgInfo *info)
 {
   info->base.refcount += 1;
+
+  return info;
 }
 
 void
diff --git a/glib/dbus-gidl.h b/glib/dbus-gidl.h
index f95abfbd..6df2bdfe 100644
--- a/glib/dbus-gidl.h
+++ b/glib/dbus-gidl.h
@@ -54,7 +54,7 @@ typedef enum
 
 } InfoType;
 
-void           base_info_ref              (BaseInfo      *info);
+BaseInfo*      base_info_ref              (BaseInfo      *info);
 void           base_info_unref            (BaseInfo      *info);
 InfoType       base_info_get_type         (BaseInfo      *info);
 const char*    base_info_get_name         (BaseInfo      *info);
@@ -65,7 +65,7 @@ GType          base_info_get_gtype        (void);
 
 
 NodeInfo*      node_info_new              (const char    *name);
-void           node_info_ref              (NodeInfo      *info);
+NodeInfo*      node_info_ref              (NodeInfo      *info);
 void           node_info_unref            (NodeInfo      *info);
 const char*    node_info_get_name         (NodeInfo      *info);
 GSList*        node_info_get_interfaces   (NodeInfo      *info);
@@ -76,7 +76,7 @@ void           node_info_add_node         (NodeInfo      *info,
                                            NodeInfo      *child);
 
 InterfaceInfo* interface_info_new         (const char    *name);
-void           interface_info_ref         (InterfaceInfo *info);
+InterfaceInfo* interface_info_ref         (InterfaceInfo *info);
 void           interface_info_unref       (InterfaceInfo *info);
 const char*    interface_info_get_name    (InterfaceInfo *info);
 GSList*        interface_info_get_methods (InterfaceInfo *info);
@@ -87,7 +87,7 @@ void           interface_info_add_signal  (InterfaceInfo *info,
                                            SignalInfo    *signal);
 
 MethodInfo*    method_info_new            (const char    *name);
-void           method_info_ref            (MethodInfo    *info);
+MethodInfo*    method_info_ref            (MethodInfo    *info);
 void           method_info_unref          (MethodInfo    *info);
 
 const char*    method_info_get_name       (MethodInfo    *info);
@@ -96,7 +96,7 @@ void           method_info_add_arg        (MethodInfo    *info,
                                            ArgInfo       *arg);
 
 SignalInfo*    signal_info_new            (const char    *name);
-void           signal_info_ref            (SignalInfo    *info);
+SignalInfo*    signal_info_ref            (SignalInfo    *info);
 void           signal_info_unref          (SignalInfo    *info);
 
 const char*    signal_info_get_name       (SignalInfo    *info);
@@ -107,7 +107,7 @@ void           signal_info_add_arg        (SignalInfo    *info,
 ArgInfo*       arg_info_new               (const char    *name,
                                            ArgDirection   direction,
                                            int            type);
-void           arg_info_ref               (ArgInfo       *info);
+ArgInfo*       arg_info_ref               (ArgInfo       *info);
 void           arg_info_unref             (ArgInfo       *info);
 const char*    arg_info_get_name          (ArgInfo       *info);
 int            arg_info_get_type          (ArgInfo       *info);
diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index 6f0737bf..6179dc99 100644
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -88,10 +88,12 @@ watch_fd_new (void)
   return watch_fd;
 }
 
-static void
+static WatchFD * 
 watch_fd_ref (WatchFD *watch_fd)
 {
   watch_fd->refcount += 1;
+
+  return watch_fd;
 }
 
 static void
diff --git a/glib/dbus-gparser.c b/glib/dbus-gparser.c
index 16d17f3d..c9b1b358 100644
--- a/glib/dbus-gparser.c
+++ b/glib/dbus-gparser.c
@@ -184,10 +184,12 @@ parser_new (void)
   return parser;
 }
 
-void
+Parser *
 parser_ref (Parser *parser)
 {
   parser->refcount += 1;
+
+  return parser;
 }
 
 void
diff --git a/glib/dbus-gparser.h b/glib/dbus-gparser.h
index cc58e5e0..97831059 100644
--- a/glib/dbus-gparser.h
+++ b/glib/dbus-gparser.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 typedef struct Parser Parser;
 
 Parser*  parser_new           (void);
-void     parser_ref           (Parser      *parser);
+Parser*  parser_ref           (Parser      *parser);
 void     parser_unref         (Parser      *parser);
 gboolean parser_check_doctype (Parser      *parser,
                                const char  *doctype,
diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index 02c53c56..65e43fc5 100644
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -93,7 +93,7 @@ struct DBusGProxyManager
 
 };
 
-static void              dbus_gproxy_manager_ref    (DBusGProxyManager *manager);
+static DBusGProxyManager *dbus_gproxy_manager_ref    (DBusGProxyManager *manager);
 static DBusHandlerResult dbus_gproxy_manager_filter (DBusConnection    *connection,
                                                      DBusMessage       *message,
                                                      void              *user_data);
@@ -152,7 +152,7 @@ dbus_gproxy_manager_get (DBusConnection *connection)
   return manager;
 }
 
-static void
+static DBusGProxyManager * 
 dbus_gproxy_manager_ref (DBusGProxyManager *manager)
 {
   g_assert (manager != NULL);
@@ -163,6 +163,8 @@ dbus_gproxy_manager_ref (DBusGProxyManager *manager)
   manager->refcount += 1;
 
   UNLOCK_MANAGER (manager);
+
+  return manager;
 }
 
 static void