Update to use KeysValues

Author: 1bsyl

src/core/linux/SDL_dbus.c

@@ -637,22 +637,19 @@ int SDL_DBus_StartLocation(void)
             goto failure;
         }
 
-        /* Dictionnary with session_handle_token */
         dbus.message_iter_init_append(msg, &iterInit);
-        if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, "session_handle_token", session_handle_token)) {
-            goto failure;
-        }
-#if 0
-        /* optional */
-        if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, "distance-threshold", "0")) {
-            goto failure;
-        }
 
-        /* optional */
-        if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, "time-threshold", "0")) {
-            goto failure;
+        /* a{sv} */
+        {
+            const char *keys[1];
+            const char *values[1];
+            keys[0] = "session_handle_token";
+            values[0] = session_handle_token;
+            if (!SDL_DBus_AppendDictWithKeysValues(&iterInit, keys, values, 1)) {
+                goto failure;
+            }
         }
-#endif
+
         if (SDL_DBus_CallWithBasicReply(dbus.session_conn, msg, DBUS_TYPE_OBJECT_PATH, &session_path)) {
             session_path = SDL_strdup(session_path);
         } else {
@@ -699,10 +696,17 @@ int SDL_DBus_StartLocation(void)
             goto failure;
         }
 
-        /* Dictionnary with handle_token */
         dbus.message_iter_init_append(msg, &iterInit);
-        if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, "handle_token", handle_token)) {
-            goto failure;
+
+        /* a{sv} */
+        {
+            const char *keys[1];
+            const char *values[1];
+            keys[0] = "handle_token";
+            values[0] = handle_token;
+            if (!SDL_DBus_AppendDictWithKeysValues(&iterInit, keys, values, 1)) {
+                goto failure;
+            }
         }
 
         if (SDL_DBus_CallWithBasicReply(dbus.session_conn, msg, DBUS_TYPE_OBJECT_PATH, &request_path)) {