gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dialog: Print DBus errors where available

Browse Source
This commit is contained in:
Colin Kinloch
2025-08-06 21:25:31 +01:00
committed by Sam Lantinga
parent c79a18d0fa
commit 5be08481e1
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/dialog/unix/SDL_portaldialog.c
View File

@@ -350,6 +350,7 @@ void SDL_Portal_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_Dialog
} }
SDL_DBusContext *dbus = SDL_DBus_GetContext(); SDL_DBusContext *dbus = SDL_DBus_GetContext();
DBusError error;
DBusMessage *msg; DBusMessage *msg;
DBusMessageIter params, options; DBusMessageIter params, options;
const char *signal_id = NULL; const char *signal_id = NULL;
@@ -361,6 +362,8 @@ void SDL_Portal_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_Dialog
const char *err_msg = validate_filters(filters, nfilters); const char *err_msg = validate_filters(filters, nfilters);
dbus->error_init(&error);
if (err_msg) { if (err_msg) {
SDL_SetError("%s", err_msg); SDL_SetError("%s", err_msg);
callback(userdata, NULL, -1); callback(userdata, NULL, -1);
@@ -459,7 +462,14 @@ void SDL_Portal_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_Dialog
} }
dbus->message_iter_close_container(&params, &options); dbus->message_iter_close_container(&params, &options);
DBusMessage *reply = dbus->connection_send_with_reply_and_block(dbus->session_conn, msg, DBUS_TIMEOUT_INFINITE, NULL); DBusMessage *reply = dbus->connection_send_with_reply_and_block(dbus->session_conn, msg, DBUS_TIMEOUT_INFINITE, &error);
if (dbus->error_is_set(&error)) {
SDL_SetError("Failed to open dialog via DBus, %s: %s", error.name, error.message);
dbus->error_free(&error);
callback(userdata, NULL, -1);
goto cleanup;
}
if (reply) { if (reply) {
DBusMessageIter reply_iter; DBusMessageIter reply_iter;
dbus->message_iter_init(reply, &reply_iter); dbus->message_iter_init(reply, &reply_iter);
@@ -485,9 +495,16 @@ void SDL_Portal_ShowFileDialogWithProperties(SDL_FileDialogType type, SDL_Dialog
} }
SDL_snprintf(filter, filter_len, SIGNAL_FILTER"%s'", signal_id); SDL_snprintf(filter, filter_len, SIGNAL_FILTER"%s'", signal_id);
dbus->bus_add_match(dbus->session_conn, filter, NULL); dbus->bus_add_match(dbus->session_conn, filter, &error);
SDL_free(filter); SDL_free(filter);
if (dbus->error_is_set(&error)) {
SDL_SetError("Failed to set up DBus listener for dialog, %s: %s", error.name, error.message);
dbus->error_free(&error);
callback(userdata, NULL, -1);
goto cleanup;
}
SignalCallback *data = SDL_malloc(sizeof(SignalCallback)); SignalCallback *data = SDL_malloc(sizeof(SignalCallback));
if (!data) { if (!data) {
callback(userdata, NULL, -1); callback(userdata, NULL, -1);