mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 11:26:16 +01:00
GApplication: Check more before warning about a missing signal handler.
* gio/application.c (g_application_real_command_line): Check that the default signal handler is not the current one before complaining, because it is not unusual for overloads to call the base class implementation as a matter of habit. g_application_real_open() and g_application_real_activate() already do this extra check.
This commit is contained in:
parent
1485871ed5
commit
91614bb5fe
@ -254,6 +254,11 @@ g_application_real_open (GApplication *application,
|
||||
static int
|
||||
g_application_real_command_line (GApplication *application,
|
||||
GApplicationCommandLine *cmdline)
|
||||
{
|
||||
if (!g_signal_has_handler_pending (application,
|
||||
g_application_signals[SIGNAL_COMMAND_LINE],
|
||||
0, TRUE) &&
|
||||
G_APPLICATION_GET_CLASS (application)->command_line == g_application_real_command_line)
|
||||
{
|
||||
static gboolean warned;
|
||||
|
||||
@ -265,6 +270,7 @@ g_application_real_command_line (GApplication *application,
|
||||
"and has no handlers connected to the 'command-line' signal.");
|
||||
|
||||
warned = TRUE;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user