projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17d981d
)
[kdbus] Catch up with latest kdbus changes
author
Lukasz Skalski
<l.skalski@samsung.com>
Mon, 20 Oct 2014 10:49:04 +0000
(10:49 +0000)
committer
Maciej Wereski
<m.wereski@partner.samsung.com>
Fri, 10 Jul 2015 09:47:43 +0000
(11:47 +0200)
gio/gkdbus.c
patch
|
blob
|
history
diff --git
a/gio/gkdbus.c
b/gio/gkdbus.c
index
322b76b
..
4b95683
100644
(file)
--- a/
gio/gkdbus.c
+++ b/
gio/gkdbus.c
@@
-177,7
+177,7
@@
g_kdbus_init (GKdbus *kdbus)
kdbus->priv->kdbus_buffer = NULL;
- kdbus->priv->hello_flags = 0; /* KDBUS_HELLO_ACCEPT_FD
| KDBUS_HELLO_ACCEPT_MEMFD
*/
+ kdbus->priv->hello_flags = 0; /* KDBUS_HELLO_ACCEPT_FD */
kdbus->priv->attach_flags = KDBUS_ATTACH_NAMES;
}
@@
-565,7
+565,7
@@
_g_kdbus_Hello (GIOStream *stream,
return NULL;
}
- if (hello->bus_flags > 0xFFFFFFFFULL
|| hello->conn_flags > 0xFFFFFFFFULL
)
+ if (hello->bus_flags > 0xFFFFFFFFULL)
{
g_set_error_literal (error,
G_IO_ERROR,