Some minor fixes by jo-so · Pull Request #962 · material-shell/material-shell · GitHub
Skip to content

Some minor fixes#962

Open
jo-so wants to merge 3 commits into
material-shell:mainfrom
jo-so:disable-modules-async
Open

Some minor fixes#962
jo-so wants to merge 3 commits into
material-shell:mainfrom
jo-so:disable-modules-async

Conversation

@jo-so

@jo-so jo-so commented May 29, 2023

Copy link
Copy Markdown

No description provided.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should return the orginalFunction result instead of await

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's okay. Should I add an undefined to the return in line 28, too?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning nothing is similar as returning undefined

jo-so added 3 commits June 25, 2023 19:35
…nction

The original method is defined as async. Hence, we need to pass through the
return value of the originalFunction and in case of an early return, we need
to return a resolved promise.

https://github.com/GNOME/gnome-shell/blob/ba43c6191798dd07f66693ec90e2808ec9954e5c/js/ui/extensionSystem.js#L217
With parallel make execution the targets are run in parallel and you get the
conflict:

```
% make compile
rm -rf dist
cp -r schemas dist
mkdir dist
glib-compile-schemas dist/schemas/
mkdir: cannot create directory ‘dist’: File exists
```
There are some changes in 4.8 and 4.9 they gives errors while compiling.
Hence, pin the version to 4.6.x.
@jo-so jo-so force-pushed the disable-modules-async branch from b08a10e to 15ff308 Compare June 25, 2023 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants