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

application: Call before/after_emit consistently

Browse Source 
Call these vfuncs also for cases where the launching instance
is the primary one. This is what the docs suggest, and it makes
before/after_emit much more useful.

Fixes: #3726
This commit is contained in:
Matthias Clasen
2025-07-10 21:16:46 -04:00
parent 182185e31e
commit 1bb48a76a6
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gio/gapplication.c
View File

@@ -1094,6 +1094,12 @@ g_application_call_command_line (GApplication *application,
GApplicationCommandLine *cmdline; GApplicationCommandLine *cmdline;
GVariant *v; GVariant *v;
gint handler_exit_status; gint handler_exit_status;
GVariant *platform_data;
g_variant_ref_sink (options);
platform_data = g_variant_ref_sink (get_platform_data (application, options));
G_APPLICATION_GET_CLASS (application)->before_emit (application, platform_data);
v = g_variant_new_bytestring_array ((const gchar **) arguments, -1); v = g_variant_new_bytestring_array ((const gchar **) arguments, -1);
cmdline = g_object_new (G_TYPE_APPLICATION_COMMAND_LINE, cmdline = g_object_new (G_TYPE_APPLICATION_COMMAND_LINE,
@@ -1107,6 +1113,10 @@ g_application_call_command_line (GApplication *application,
*exit_status = g_application_command_line_get_exit_status (cmdline); *exit_status = g_application_command_line_get_exit_status (cmdline);
g_object_unref (cmdline); g_object_unref (cmdline);
G_APPLICATION_GET_CLASS (application)->after_emit (application, platform_data);
g_variant_unref (platform_data);
g_variant_unref (options);
} }
} }
@@ -2451,7 +2461,14 @@ g_application_activate (GApplication *application)
get_platform_data (application, NULL)); get_platform_data (application, NULL));
else else
{
GVariant *platform_data = g_variant_ref_sink (get_platform_data (application, NULL));
G_APPLICATION_GET_CLASS (application)->before_emit (application, platform_data);
g_signal_emit (application, g_application_signals[SIGNAL_ACTIVATE], 0); g_signal_emit (application, g_application_signals[SIGNAL_ACTIVATE], 0);
G_APPLICATION_GET_CLASS (application)->after_emit (application, platform_data);
g_variant_unref (platform_data);
}
} }
/** /**
@@ -2495,8 +2512,14 @@ g_application_open (GApplication *application,
get_platform_data (application, NULL)); get_platform_data (application, NULL));
else else
g_signal_emit (application, g_application_signals[SIGNAL_OPEN], {
0, files, n_files, hint); GVariant *platform_data = g_variant_ref_sink (get_platform_data (application, NULL));
G_APPLICATION_GET_CLASS (application)->before_emit (application, platform_data);
g_signal_emit (application, g_application_signals[SIGNAL_OPEN], 0, files, n_files, hint);
G_APPLICATION_GET_CLASS (application)->after_emit (application, platform_data);
g_variant_unref (platform_data);
}
} }
/* Run {{{1 */ /* Run {{{1 */