projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...
[platform/upstream/dbus.git]
/
dbus
/
dbus-server-unix.h
diff --git
a/dbus/dbus-server-unix.h
b/dbus/dbus-server-unix.h
index
1d038db
..
92b996c
100644
(file)
--- a/
dbus/dbus-server-unix.h
+++ b/
dbus/dbus-server-unix.h
@@
-1,9
+1,9
@@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"
; indent-tabs-mode: nil;
-*- */
/* dbus-server-unix.h Server implementation for Unix network protocols.
*
* Copyright (C) 2002 Red Hat Inc.
*
/* dbus-server-unix.h Server implementation for Unix network protocols.
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version
1.2
+ * Licensed under the Academic Free License version
2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*
*/
#ifndef DBUS_SERVER_UNIX_H
*
*/
#ifndef DBUS_SERVER_UNIX_H
@@
-26,17
+26,12
@@
#include <dbus/dbus-internals.h>
#include <dbus/dbus-server-protected.h>
#include <dbus/dbus-internals.h>
#include <dbus/dbus-server-protected.h>
-DBUS_BEGIN_DECLS
;
+DBUS_BEGIN_DECLS
-DBusServer* _dbus_server_new_for_fd (int fd,
- const DBusString *address);
DBusServer* _dbus_server_new_for_domain_socket (const char *path,
DBusServer* _dbus_server_new_for_domain_socket (const char *path,
+ dbus_bool_t abstract,
DBusError *error);
DBusError *error);
-DBusServer* _dbus_server_new_for_tcp_socket (const char *host,
- dbus_uint32_t port,
- DBusError *error);
-
-DBUS_END_DECLS
;
+DBUS_END_DECLS
#endif /* DBUS_SERVER_UNIX_H */
#endif /* DBUS_SERVER_UNIX_H */