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 branch 'dbus-1.4'
[platform/upstream/dbus.git]
/
dbus
/
dbus-connection.c
diff --git
a/dbus/dbus-connection.c
b/dbus/dbus-connection.c
index
e656cd2
..
2cdd365
100644
(file)
--- a/
dbus/dbus-connection.c
+++ b/
dbus/dbus-connection.c
@@
-38,6
+38,7
@@
#include "dbus-protocol.h"
#include "dbus-dataslot.h"
#include "dbus-string.h"
#include "dbus-protocol.h"
#include "dbus-dataslot.h"
#include "dbus-string.h"
+#include "dbus-signature.h"
#include "dbus-pending-call.h"
#include "dbus-object-tree.h"
#include "dbus-threads-internal.h"
#include "dbus-pending-call.h"
#include "dbus-object-tree.h"
#include "dbus-threads-internal.h"
@@
-3095,7
+3096,7
@@
dbus_connection_can_send_type(DBusConnection *connection,
{
_dbus_return_val_if_fail (connection != NULL, FALSE);
{
_dbus_return_val_if_fail (connection != NULL, FALSE);
- if (!
_dbus_type_is_valid
(type))
+ if (!
dbus_type_is_valid
(type))
return FALSE;
if (type != DBUS_TYPE_UNIX_FD)
return FALSE;
if (type != DBUS_TYPE_UNIX_FD)
@@
-4522,6
+4523,7
@@
dbus_connection_dispatch (DBusConnection *connection)
DBusPendingCall *pending;
dbus_int32_t reply_serial;
DBusDispatchStatus status;
DBusPendingCall *pending;
dbus_int32_t reply_serial;
DBusDispatchStatus status;
+ dbus_bool_t found_object;
_dbus_return_val_if_fail (connection != NULL, DBUS_DISPATCH_COMPLETE);
_dbus_return_val_if_fail (connection != NULL, DBUS_DISPATCH_COMPLETE);
@@
-4686,7
+4688,8
@@
dbus_connection_dispatch (DBusConnection *connection)
HAVE_LOCK_CHECK (connection);
result = _dbus_object_tree_dispatch_and_unlock (connection->objects,
HAVE_LOCK_CHECK (connection);
result = _dbus_object_tree_dispatch_and_unlock (connection->objects,
- message);
+ message,
+ &found_object);
CONNECTION_LOCK (connection);
CONNECTION_LOCK (connection);
@@
-4725,7
+4728,7
@@
dbus_connection_dispatch (DBusConnection *connection)
}
reply = dbus_message_new_error (message,
}
reply = dbus_message_new_error (message,
-
DBUS_ERROR_UNKNOWN_METHOD
,
+
found_object ? DBUS_ERROR_UNKNOWN_METHOD : DBUS_ERROR_UNKNOWN_OBJECT
,
_dbus_string_get_const_data (&str));
_dbus_string_free (&str);
_dbus_string_get_const_data (&str));
_dbus_string_free (&str);