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

window-tracker: use generic meta_window_get_sandboxed_app_id

Browse Source 
This is valid for both Flatpak's and snaps now, we can use a more generic
API then.

https://bugzilla.gnome.org/show_bug.cgi?id=789277
This commit is contained in:
Marco Trevisan (Treviño) 2017-10-20 21:49:24 -05:00
parent 29eefc06d7
commit f9569912df
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shell-window-tracker.c
View File

@ -256,21 +256,21 @@ get_app_from_gapplication_id (MetaWindow *window)
} }
/* /*
* get_app_from_flatpak_id: * get_app_from_sandboxed_app_id:
* @window: a #MetaWindow * @window: a #MetaWindow
* *
* Looks only at the given window, and attempts to determine * Looks only at the given window, and attempts to determine
* an application based on its Flatpak ID. If one can't be determined, * an application based on its Flatpak or Snap ID. If one can't be determined,
* return %NULL. * return %NULL.
* *
* Return value: (transfer full): A newly-referenced #ShellApp, or %NULL * Return value: (transfer full): A newly-referenced #ShellApp, or %NULL
*/ */
static ShellApp * static ShellApp *
get_app_from_flatpak_id (MetaWindow *window) get_app_from_sandboxed_app_id (MetaWindow *window)
{ {
const char *id; const char *id;
id = meta_window_get_flatpak_id (window); id = meta_window_get_sandboxed_app_id (window);
if (!id) if (!id)
return NULL; return NULL;
@ -395,10 +395,10 @@ get_app_for_window (ShellWindowTracker *tracker,
if (meta_window_is_remote (window)) if (meta_window_is_remote (window))
return _shell_app_new_for_window (window); return _shell_app_new_for_window (window);
/* Check if the window was opened from within a Flatpak sandbox; if this /* Check if the window was opened from within a sandbox; if this
* is the case, a corresponding .desktop file is guaranteed to match; * is the case, a corresponding .desktop file is guaranteed to match;
*/ */
result = get_app_from_flatpak_id (window); result = get_app_from_sandboxed_app_id (window);
if (result != NULL) if (result != NULL)
return result; return result;