2003-02-13 Anders Carlsson <andersca@codefactory.se>
+ * bus/driver.c: (bus_driver_handle_hello):
+ * bus/driver.h:
+ * bus/services.c: (bus_service_lookup):
+ Reorder message sending so we get a more sane order.
+
+ * test/bus-test.c: (message_handler):
+ Fix tyop.
+
+2003-02-13 Anders Carlsson <andersca@codefactory.se>
+
* bus/driver.c: (bus_driver_send_service_deleted),
(bus_driver_send_service_created), (bus_driver_send_service_lost),
(bus_driver_send_service_acquired), (bus_driver_handle_hello),
dbus_message_unref (message);
}
-static void
+void
bus_driver_send_service_created (const char *service_name)
{
DBusMessage *message;
BUS_HANDLE_OOM (_dbus_string_init (&unique_name, _DBUS_INT_MAX));
BUS_HANDLE_OOM (create_unique_client_name (&unique_name));
+
+ BUS_HANDLE_OOM (bus_connection_set_name (connection, &unique_name));
+ BUS_HANDLE_OOM (dbus_message_set_sender (message,
+ bus_connection_get_name (connection)));
+ BUS_HANDLE_OOM (bus_driver_send_welcome_message (connection, message));
+
/* Create the service */
BUS_HANDLE_OOM (service = bus_service_lookup (&unique_name, TRUE));
bus_service_set_prohibit_replacement (service, TRUE);
/* Add the connection as the owner */
BUS_HANDLE_OOM (bus_service_add_owner (service, connection));
- BUS_HANDLE_OOM (bus_connection_set_name (connection, &unique_name));
- BUS_HANDLE_OOM (dbus_message_set_sender (message,
- bus_connection_get_name (connection)));
-
_dbus_string_free (&unique_name);
-
- BUS_HANDLE_OOM (bus_driver_send_welcome_message (connection, message));
-
- /* Broadcast a service created message */
- bus_driver_send_service_created (bus_service_get_name (service));
}
static void
const char *service_name);
void bus_driver_send_service_acquired (DBusConnection *connection,
const char *service_name);
+void bus_driver_send_service_created (const char *service_name);
return NULL;
}
+ bus_driver_send_service_created (service->name);
+
return service;
}
dbus_connection_hookup_with_g_main (connection);
message = dbus_message_new ("org.freedesktop.DBus", "org.freedesktop.DBus.Hello");
- dbus_message_append_fields (message,
- DBUS_TYPE_STRING, "glib-test",
- 0);
reply = dbus_connection_send_message_with_reply_and_block (connection, message, -1, &result);
g_print ("reply name: %s\n", dbus_message_get_name (reply));
DBusMessage *message,
void *user_data)
{
- printf ("server got a message!: %s\n",
+ printf ("client got a message!: %s\n",
dbus_message_get_name (message));
return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
}