luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'desktop-app-info-startup-id' into 'main'

Browse Source 
gdesktopappinfo: Add a missing NULL check

See merge request GNOME/glib!3325
This commit is contained in:
Marco Trevisan 2023-03-15 14:03:58 +00:00
commit 7fec23ed5e
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gdesktopappinfo.c
View File

@ -3157,7 +3157,7 @@ typedef struct
GDesktopAppInfo *info; /* (owned) */
GAppLaunchContext *launch_context; /* (owned) (nullable) */
GAsyncReadyCallback callback;
gchar *startup_id; /* (owned) */
gchar *startup_id; /* (owned) (nullable) */
gpointer user_data;
} LaunchUrisWithDBusData;
@ -3182,7 +3182,10 @@ launch_uris_with_dbus_signal_cb (GObject *object,
if (data->launch_context)
{
if (g_task_had_error (G_TASK (result)))
g_app_launch_context_launch_failed (data->launch_context, data->startup_id);
{
if (data->startup_id != NULL)
g_app_launch_context_launch_failed (data->launch_context, data->startup_id);
}
else
{
GVariant *platform_data;

51
gio/tests/desktop-app-info.c
View File

@ -1807,6 +1807,56 @@ test_launch_fail_absolute_path (void)
g_clear_object (&app_info);
}
static void
async_result_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
GAsyncResult **result_out = user_data;
g_assert (*result_out == NULL);
*result_out = g_object_ref (result);
g_main_context_wakeup (g_main_context_get_thread_default ());
}
static void
test_launch_fail_dbus (void)
{
GTestDBus *bus = NULL;
GDesktopAppInfo *app_info = NULL;
GAppLaunchContext *context = NULL;
GAsyncResult *result = NULL;
GError *error = NULL;
/* Set up a test session bus to ensure that launching the app happens using
* D-Bus rather than spawning. */
bus = g_test_dbus_new (G_TEST_DBUS_NONE);
g_test_dbus_up (bus);
app_info = g_desktop_app_info_new_from_filename (g_test_get_filename (G_TEST_DIST, "org.gtk.test.dbusappinfo.desktop", NULL));
g_assert_nonnull (app_info);
g_assert_true (g_desktop_app_info_has_key (app_info, "DBusActivatable"));
context = g_app_launch_context_new ();
g_app_info_launch_uris_async (G_APP_INFO (app_info), NULL, context, NULL, async_result_cb, &result);
while (result == NULL)
g_main_context_iteration (NULL, TRUE);
g_assert_false (g_app_info_launch_uris_finish (G_APP_INFO (app_info), result, &error));
g_assert_error (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN);
g_test_dbus_down (bus);
g_clear_object (&bus);
g_clear_error (&error);
g_clear_object (&result);
g_clear_object (&context);
g_clear_object (&app_info);
}
int
main (int argc,
char *argv[])
@ -1849,6 +1899,7 @@ main (int argc,
g_test_add_func ("/desktop-app-info/launch/fail", test_launch_fail);
g_test_add_func ("/desktop-app-info/launch/fail-absolute-path", test_launch_fail_absolute_path);
g_test_add_func ("/desktop-app-info/launch/fail-startup-notify", test_launch_startup_notify_fail);
g_test_add_func ("/desktop-app-info/launch/fail-dbus", test_launch_fail_dbus);
g_test_add_func ("/desktop-app-info/launch-as-manager", test_launch_as_manager);
g_test_add_func ("/desktop-app-info/launch-as-manager/fail", test_launch_as_manager_fail);
g_test_add_func ("/desktop-app-info/launch-default-uri-handler", test_default_uri_handler);