[Telepathy-commits] [telepathy-glib/master] dbus.[ch]: rename 'daemon' function parameter to bus_daemon

[Simon McVittie]

Otherwise, this shadows daemon(3) under glibc with _BSD_SOURCE or
_XOPEN_SOURCE (and so presumably, also on real BSD systems), provoking a
warning. Thanks, libc.
---
 telepathy-glib/dbus.c |    2 +-
 telepathy-glib/dbus.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 0b68187..6cd1ea9 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -710,7 +710,7 @@ _tp_dbus_daemon_got_name_owner (TpDBusDaemon *self,
 
 /**
  * TpDBusDaemonNameOwnerChangedCb:
- * @daemon: The D-Bus daemon
+ * @bus_daemon: The D-Bus daemon
  * @name: The name whose ownership has changed or been discovered
  * @new_owner: The unique name that now owns @name
  * @user_data: Arbitrary user-supplied data as passed to
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index f3ac427..dbcc0a8 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -53,7 +53,7 @@ GType tp_dbus_daemon_get_type (void);
 
 TpDBusDaemon *tp_dbus_daemon_new (DBusGConnection *connection);
 
-typedef void (*TpDBusDaemonNameOwnerChangedCb) (TpDBusDaemon *daemon,
+typedef void (*TpDBusDaemonNameOwnerChangedCb) (TpDBusDaemon *bus_daemon,
     const gchar *name, const gchar *new_owner, gpointer user_data);
 
 void tp_dbus_daemon_watch_name_owner (TpDBusDaemon *self,
-- 
1.5.6.5