projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003-08-12 Havoc Pennington <hp@pobox.com>
[platform/upstream/dbus.git]
/
bus
/
dispatch.c
diff --git
a/bus/dispatch.c
b/bus/dispatch.c
index
6902da6
..
e8f0c9b
100644
(file)
--- a/
bus/dispatch.c
+++ b/
bus/dispatch.c
@@
-100,7
+100,7
@@
bus_dispatch_broadcast_message (BusTransaction *transaction,
return TRUE;
}
return TRUE;
}
-static
void
+static
DBusHandlerResult
bus_dispatch (DBusConnection *connection,
DBusMessage *message)
{
bus_dispatch (DBusConnection *connection,
DBusMessage *message)
{
@@
-108,6
+108,9
@@
bus_dispatch (DBusConnection *connection,
DBusError error;
BusTransaction *transaction;
BusContext *context;
DBusError error;
BusTransaction *transaction;
BusContext *context;
+ DBusHandlerResult result;
+
+ result = DBUS_HANDLER_RESULT_HANDLED;
transaction = NULL;
dbus_error_init (&error);
transaction = NULL;
dbus_error_init (&error);
@@
-145,6
+148,7
@@
bus_dispatch (DBusConnection *connection,
/* DBusConnection also handles some of these automatically, we leave
* it to do so.
*/
/* DBusConnection also handles some of these automatically, we leave
* it to do so.
*/
+ result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
goto out;
}
goto out;
}
@@
-295,6
+299,8
@@
bus_dispatch (DBusConnection *connection,
}
dbus_connection_unref (connection);
}
dbus_connection_unref (connection);
+
+ return result;
}
static DBusHandlerResult
}
static DBusHandlerResult
@@
-303,9
+309,7
@@
bus_dispatch_message_handler (DBusMessageHandler *handler,
DBusMessage *message,
void *user_data)
{
DBusMessage *message,
void *user_data)
{
- bus_dispatch (connection, message);
-
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ return bus_dispatch (connection, message);
}
static void
}
static void