mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-05 19:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-add the simpler SDL_DBus_AppendDictWithKeyValue() function

Browse Source
This commit is contained in:
Sam Lantinga
2023-06-23 07:28:05 -07:00
parent 6f344f29b8
commit 6b12fbc6b7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/linux/SDL_dbus.c
View File

@@ -367,7 +367,7 @@ void SDL_DBus_ScreensaverTickle(void)
}
}
static SDL_bool SDL_DBus_AppendDictWithKeysValues(DBusMessageIter *iterInit, const char **keys, const char **values, int count)
static SDL_bool SDL_DBus_AppendDictWithKeysAndValues(DBusMessageIter *iterInit, const char **keys, const char **values, int count)
{
DBusMessageIter iterDict;
@@ -414,6 +414,16 @@ failed:
return SDL_FALSE;
}
static SDL_bool SDL_DBus_AppendDictWithKeyValue(DBusMessageIter *iterInit, const char *key, const char *value)
{
const char *keys[1];
const char *values[1];
keys[0] = key;
values[0] = value;
return SDL_DBus_AppendDictWithKeysAndValues(iterInit, keys, values, 1);
}
SDL_bool SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
{
const char *default_inhibit_reason = "Playing a game";
@@ -459,15 +469,9 @@ SDL_bool SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
dbus.message_iter_init_append(msg, &iterInit);
/* a{sv} */
{
const char *keys[1];
const char *values[1];
keys[0] = key;
values[0] = reason;
if (!SDL_DBus_AppendDictWithKeysValues(&iterInit, keys, values, 1)) {
dbus.message_unref(msg);
return SDL_FALSE;
}
if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, key, reason)) {
dbus.message_unref(msg);
return SDL_FALSE;
}
if (SDL_DBus_CallWithBasicReply(dbus.session_conn, msg, DBUS_TYPE_OBJECT_PATH, &reply)) {