isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Don't check whether zenity supports options

Browse Source 
Doing this synchronously means that zenity tries to initialize GTK+.
Under Wayland, that will try to connect back to mutter as a display
server. We're waiting on zenity to exit, and zenity is waiting for
a connection response. Deadlock.

Simply assume that zenity will support all the options we feed it,
since it should be the correct version. Perhaps we should replace
our use of zenity with a simple helper binary that we know will
have all the right options if this still isn't good enough.
This commit is contained in:
Jasper St. Pierre 2014-04-15 17:18:18 -04:00
parent 37de96ce86
commit 86100936d9
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/util.c
View File

@ -579,23 +579,6 @@ meta_external_binding_name_for_action (guint keybinding_action)
return g_strdup_printf ("external-grab-%u", keybinding_action); return g_strdup_printf ("external-grab-%u", keybinding_action);
} }
static gboolean
zenity_supports_option (const char *section, const char *option)
{
char *command, *out;
gboolean rv;
command = g_strdup_printf ("zenity %s", section);
g_spawn_command_line_sync (command, &out, NULL, NULL, NULL);
rv = (out && strstr (out, option));
g_free (command);
g_free (out);
return rv;
}
/* Command line arguments are passed in the locale encoding; in almost /* Command line arguments are passed in the locale encoding; in almost
* all cases, we'd hope that is UTF-8 and no conversion is necessary. * all cases, we'd hope that is UTF-8 and no conversion is necessary.
* If it's not UTF-8, then it's possible that the message isn't * If it's not UTF-8, then it's possible that the message isn't
@ -684,13 +667,8 @@ meta_show_dialog (const char *type,
if (icon_name) if (icon_name)
{ {
char *option = g_strdup_printf ("--help%s", type + 1); append_argument (args, "--icon-name");
if (zenity_supports_option (option, "--icon-name")) append_argument (args, icon_name);
{
append_argument (args, "--icon-name");
append_argument (args, icon_name);
}
g_free (option);
} }
tmp = columns; tmp = columns;
@ -714,8 +692,7 @@ meta_show_dialog (const char *type,
setenv ("WINDOWID", env, 1); setenv ("WINDOWID", env, 1);
g_free (env); g_free (env);
if (zenity_supports_option ("--help-general", "--modal")) append_argument (args, "--modal");
append_argument (args, "--modal");
} }
g_ptr_array_add (args, NULL); /* NULL-terminate */ g_ptr_array_add (args, NULL); /* NULL-terminate */