From fe1eab1b3cd00d765eeb59a05e7edd54b910eac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 17 Dec 2019 20:06:24 +0100
Subject: [PATCH] cleanup: Also replace Params.parse(..., true) with spread

This is what Params.parse() boils down to when accepting extra
parameters, so we can just as well use standard syntax here.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3196>
---
 js/ui/appDisplay.js         | 6 ++----
 js/ui/notificationDaemon.js | 3 +--
 js/ui/panelMenu.js          | 8 +++-----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index cb1a41250..aca6002eb 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -21,7 +21,6 @@ import * as ParentalControlsManager from '../misc/parentalControlsManager.js';
 import * as PopupMenu from './popupMenu.js';
 import * as Search from './search.js';
 import * as SwipeTracker from './swipeTracker.js';
-import * as Params from '../misc/params.js';
 import * as SystemActions from '../misc/systemActions.js';
 
 import * as Main from './main.js';
@@ -2986,10 +2985,9 @@ export const AppIcon = GObject.registerClass({
 }, class AppIcon extends AppViewItem {
     _init(app, iconParams = {}) {
         // Get the isDraggable property without passing it on to the BaseIcon:
-        const appIconParams = Params.parse(iconParams, {isDraggable: true}, true);
-        const isDraggable = appIconParams['isDraggable'];
+        const isDraggable = iconParams['isDraggable'] ?? true;
         delete iconParams['isDraggable'];
-        const expandTitleOnHover = appIconParams['expandTitleOnHover'];
+        const expandTitleOnHover = iconParams['expandTitleOnHover'];
         delete iconParams['expandTitleOnHover'];
 
         super._init({style_class: 'overview-tile'}, isDraggable, expandTitleOnHover);
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 703316f5f..1f68a1c54 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -9,7 +9,6 @@ import Shell from 'gi://Shell';
 import * as Config from '../misc/config.js';
 import * as Main from './main.js';
 import * as MessageTray from './messageTray.js';
-import * as Params from '../misc/params.js';
 
 import {loadInterfaceXML} from '../misc/fileUtils.js';
 import {NotificationErrors, NotificationError} from '../misc/dbusErrors.js';
@@ -128,7 +127,7 @@ class FdoNotificationDaemon {
             hints[hint] = hints[hint].deepUnpack();
         }
 
-        hints = Params.parse(hints, {urgency: Urgency.NORMAL}, true);
+        hints = {urgency: Urgency.NORMAL, ...hints};
 
         // Be compatible with the various hints for image data and image path
         // 'image-data' and 'image-path' are the latest name of these hints, introduced in 1.2
diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 49c557b3a..ef5144a50 100644
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -6,19 +6,17 @@ import GObject from 'gi://GObject';
 import St from 'gi://St';
 
 import * as Main from './main.js';
-import * as Params from '../misc/params.js';
 import * as PopupMenu from './popupMenu.js';
 
 export const ButtonBox = GObject.registerClass(
 class ButtonBox extends St.Widget {
     _init(params) {
-        params = Params.parse(params, {
+        super._init({
             style_class: 'panel-button',
             x_expand: true,
             y_expand: true,
-        }, true);
-
-        super._init(params);
+            ...params,
+        });
 
         this._delegate = this;