diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-24 16:44:23 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-09-24 16:49:49 +0100 |
| commit | 67abfd82e0c251321ddea2bd2f6695735b9aa61f (patch) | |
| tree | 9d0b31e5ac7b04467eee3bc9ff1c152c6cb6dd5d /telepathy-glib/dbus.h | |
| parent | d4fb7328110ad71584cd1d3bec44539ced04ba7b (diff) | |
| download | telepathy-glib-67abfd82e0c251321ddea2bd2f6695735b9aa61f.tar.gz | |
dbus.[ch]: rename 'daemon' function parameter to bus_daemon
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.
Diffstat (limited to 'telepathy-glib/dbus.h')
| -rw-r--r-- | telepathy-glib/dbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h index f3ac42745..dbcc0a8da 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, |