← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick-proposed

« back to all changes in this revision

Viewing changes to dbus/dbus-server-socket.h

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-27 13:06:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100927130632-bqs145trvchd2lmf
Tags: 1.4.0-0ubuntu1
* New upstream release
 - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=17754 Race condition in protected_change_timeout
 - Requested by various upstream KDE developers http://lists.kde.org/?t=128514970000004&r=1&w=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
dbus/dbus-server-socket.h
25
25
 
26
26
#include <dbus/dbus-internals.h>
27
27
#include <dbus/dbus-server-protected.h>
 
28
#include <dbus/dbus-nonce.h>
28
29
 
29
30
DBUS_BEGIN_DECLS
30
31
 
31
32
DBusServer* _dbus_server_new_for_socket           (int              *fds,
32
33
                                                   int               n_fds,
33
 
                                                   const DBusString *address);
 
34
                                                   const DBusString *address,
 
35
                                                   DBusNonceFile    *noncefile);
34
36
DBusServer* _dbus_server_new_for_tcp_socket       (const char       *host,
35
37
                                                   const char       *bind,
36
38
                                                   const char       *port,
37
39
                                                   const char       *family,
38
 
                                                   DBusError        *error);
 
40
                                                   DBusError        *error,
 
41
                                                   dbus_bool_t      use_nonce);
39
42
DBusServerListenResult _dbus_server_listen_socket (DBusAddressEntry  *entry,
40
43
                                                   DBusServer       **server_p,
41
44
                                                   DBusError         *error);