isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

runDialog: Don’t treat empty input specially

Browse Source 
Let empty input result in an error, just like other invalid commands
(bad syntax, nonempty whitespace, etc.). GLib already has an error
message “Text was empty (or contained only whitespace)” which it shows
for whitespace-only input, so letting that message apply also to empty
input makes sense.

This requires some tweaks further down the file to avoid interpreting
empty input as an empty path (relative to the home directory) and then
opening the home directory.

Part of https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3183.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1442>
This commit is contained in:
Lucas Werkmeister 2021-02-07 19:12:57 +01:00 committed by Marge Bot
parent 473e77e2c5
commit 7bea63ae4b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/runDialog.js
View File

@ -189,7 +189,7 @@ class RunDialog extends ModalDialog.ModalDialog {
f = null; f = null;
if (f) { if (f) {
f(); f();
} else if (input) { } else {
try { try {
if (inTerminal) { if (inTerminal) {
let exec = this._terminalSettings.get_string(EXEC_KEY); let exec = this._terminalSettings.get_string(EXEC_KEY);
@ -202,13 +202,13 @@ class RunDialog extends ModalDialog.ModalDialog {
let path = null; let path = null;
if (input.charAt(0) == '/') { if (input.charAt(0) == '/') {
path = input; path = input;
} else { } else if (input) {
if (input.charAt(0) == '~') if (input.charAt(0) == '~')
input = input.slice(1); input = input.slice(1);
path = '%s/%s'.format(GLib.get_home_dir(), input); path = '%s/%s'.format(GLib.get_home_dir(), input);
} }
if (GLib.file_test(path, GLib.FileTest.EXISTS)) { if (path && GLib.file_test(path, GLib.FileTest.EXISTS)) {
let file = Gio.file_new_for_path(path); let file = Gio.file_new_for_path(path);
try { try {
Gio.app_info_launch_default_for_uri(file.get_uri(), Gio.app_info_launch_default_for_uri(file.get_uri(),