luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdesktopappinfo: Use strstr instead of g_str_has_prefix for search

Browse Source 
Fixes: #1152
This commit is contained in:
Alynx Zhou 2022-12-02 19:19:47 +00:00 committed by Philip Withnall
parent 108f129096
commit 6dd5f2515f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdesktopappinfo.c
View File

@ -1224,7 +1224,7 @@ desktop_file_dir_unindexed_search (DesktopFileDir *dir,
{
MemoryIndexEntry *mie = value;
if (!g_str_has_prefix (key, search_token))
if (strstr (key, search_token) == NULL)
continue;
while (mie)

14
gio/tests/desktop-app-info.c
View File

@ -867,9 +867,11 @@ test_search (void)
assert_search ("image viewer", "", TRUE, TRUE, NULL, NULL);
/* There're "flatpak" apps (clocks) installed as well - they should *not*
* match the prefix command ("/bin/sh") in the Exec= line though.
* match the prefix command ("/bin/sh") in the Exec= line though. However,
* with substring matching, Image Viewer (eog) should be in result list
* because it contains "Slideshow" in its keywords.
*/
assert_search ("sh", "gnome-terminal.desktop\n", TRUE, FALSE, NULL, NULL);
assert_search ("sh", "eog.desktop gnome-terminal.desktop\n", TRUE, FALSE, NULL, NULL);
/* "frobnicator.desktop" is ignored by get_all() because the binary is
* missing, but search should still find it (to avoid either stale results
@ -884,11 +886,11 @@ test_search (void)
assert_search ("files file fil fi f", "nautilus.desktop\n"
"gedit.desktop\n", TRUE, TRUE, NULL, NULL);
/* "con" will match "connect" and "contacts" on name but dconf only on
* the "config" keyword
/* With substring match, "con" match dconf, contacts, nautilus-classic (which
* has a name called "Desktop Icons"), nautilus-connect-server (which has a
* name called "Connect to Server").
*/
assert_search ("con", "nautilus-connect-server.desktop gnome-contacts.desktop\n"
"dconf-editor.desktop\n", TRUE, TRUE, NULL, NULL);
assert_search ("con", "dconf-editor.desktop gnome-contacts.desktop nautilus-classic.desktop nautilus-connect-server.desktop\n", TRUE, TRUE, NULL, NULL);
/* "gnome" will match "eye of gnome" from the user's directory, plus
* matching "GNOME Clocks" X-GNOME-FullName. It's only a comment on