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

app: Don't rely on app menu to check for GtkApplications

Browse Source 
As the app menu is being phased out, it is no longer a good indicator
for GtkApplications. Instead, base the check directly on the appropriate
D-Bus properties.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/624
This commit is contained in:
Florian Müllner 2018-10-04 19:11:05 +02:00
parent 593f15ad63
commit 3da747ec2d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shell-app.c
View File

@ -608,6 +608,7 @@ gboolean
shell_app_can_open_new_window (ShellApp *app) shell_app_can_open_new_window (ShellApp *app)
{ {
ShellAppRunningState *state; ShellAppRunningState *state;
MetaWindow *window;
/* Apps that are not running can always open new windows, because /* Apps that are not running can always open new windows, because
activating them would open the first one */ activating them would open the first one */
@ -641,11 +642,13 @@ shell_app_can_open_new_window (ShellApp *app)
Activate() knows nothing about the other instances, so it will show a Activate() knows nothing about the other instances, so it will show a
new window. new window.
*/ */
if (state->remote_menu)
window = g_slist_nth_data (state->windows, 0);
if (state->unique_bus_name != NULL &&
meta_window_get_gtk_application_object_path (window) != NULL)
{ {
const char *application_id; if (meta_window_get_gtk_application_id (window) != NULL)
application_id = meta_window_get_gtk_application_id (state->windows->data);
if (application_id != NULL)
return FALSE; return FALSE;
else else
return TRUE; return TRUE;