luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 04:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gapplication: Expose zero-valued numbers in handle-local-options"

Browse Source 
This reverts commit 1ed67a9c44.

It turns out that including options, with their default values, in the
`handle-local-options` signal, which weren’t set on the command line,
breaks some applications.

In particular, it breaks Inkscape, which is the application this commit
was originally meant to fix (a different problem).

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2611
Breaks: #2329
See: !1953
This commit is contained in:
Philip Withnall 2022-03-04 18:16:12 +00:00
parent 887f73d34e
commit 23e935a342
2 changed files with 6 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gapplication.c
View File

@ -434,7 +434,8 @@ g_application_pack_option_entries (GApplication *application,
break; break;
case G_OPTION_ARG_INT: case G_OPTION_ARG_INT:
value = g_variant_new_int32 (*(gint32 *) entry->arg_data); if (*(gint32 *) entry->arg_data)
value = g_variant_new_int32 (*(gint32 *) entry->arg_data);
break; break;
case G_OPTION_ARG_FILENAME: case G_OPTION_ARG_FILENAME:
@ -453,11 +454,13 @@ g_application_pack_option_entries (GApplication *application,
break; break;
case G_OPTION_ARG_DOUBLE: case G_OPTION_ARG_DOUBLE:
value = g_variant_new_double (*(gdouble *) entry->arg_data); if (*(gdouble *) entry->arg_data)
value = g_variant_new_double (*(gdouble *) entry->arg_data);
break; break;
case G_OPTION_ARG_INT64: case G_OPTION_ARG_INT64:
value = g_variant_new_int64 (*(gint64 *) entry->arg_data); if (*(gint64 *) entry->arg_data)
value = g_variant_new_int64 (*(gint64 *) entry->arg_data);
break; break;
default: default:
@ -696,10 +699,6 @@ add_packed_option (GApplication *application,
* consumed, they will no longer be visible to the default handling * consumed, they will no longer be visible to the default handling
* (which treats them as filenames to be opened). * (which treats them as filenames to be opened).
* *
* The dict includes options that have been explicitly specified on the parsed
* commandline, as well as zero values for numeric options that were not
* necessarily specified.
*
* It is important to use the proper GVariant format when retrieving * It is important to use the proper GVariant format when retrieving
* the options with g_variant_dict_lookup(): * the options with g_variant_dict_lookup():
* - for %G_OPTION_ARG_NONE, use `b` * - for %G_OPTION_ARG_NONE, use `b`

48
gio/tests/gapplication.c
View File

@ -1020,53 +1020,6 @@ test_handle_local_options_passthrough (void)
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
} }
static gint
test_local_options_double (GApplication *app,
GVariantDict *options,
gpointer data)
{
gboolean *called = data;
gdouble number = 1.0;
*called = TRUE;
g_assert_true (g_variant_dict_lookup (options, "number", "d", &number));
g_assert_cmpfloat (number, ==, 0.0);
return 0;
}
static void
test_handle_local_options_double (void)
{
g_test_summary ("Test that a double of value 0.0 can be parsed using the options handling");
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2329");
if (g_test_subprocess ())
{
char *binpath = g_test_build_filename (G_TEST_BUILT, "unimportant", NULL);
gchar *argv[] = { binpath, "--number", "0.0", NULL };
GApplication *app;
gboolean called = FALSE;
int status;
app = g_application_new ("org.gtk.TestApplication", 0);
g_application_add_main_option (app, "number", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_DOUBLE, "", "");
g_signal_connect (app, "handle-local-options", G_CALLBACK (test_local_options_double), &called);
status = g_application_run (app, G_N_ELEMENTS (argv) -1, argv);
g_assert_true (called);
g_assert_cmpint (status, ==, 0);
g_object_unref (app);
g_free (binpath);
return;
}
g_test_trap_subprocess (NULL, 0, G_TEST_SUBPROCESS_INHERIT_STDOUT | G_TEST_SUBPROCESS_INHERIT_STDERR);
g_test_trap_assert_passed ();
}
static void static void
test_api (void) test_api (void)
{ {
@ -1269,7 +1222,6 @@ main (int argc, char **argv)
g_test_add_func ("/gapplication/test-handle-local-options1", test_handle_local_options_success); g_test_add_func ("/gapplication/test-handle-local-options1", test_handle_local_options_success);
g_test_add_func ("/gapplication/test-handle-local-options2", test_handle_local_options_failure); g_test_add_func ("/gapplication/test-handle-local-options2", test_handle_local_options_failure);
g_test_add_func ("/gapplication/test-handle-local-options3", test_handle_local_options_passthrough); g_test_add_func ("/gapplication/test-handle-local-options3", test_handle_local_options_passthrough);
g_test_add_func ("/gapplication/test-handle-local-options4", test_handle_local_options_double);
g_test_add_func ("/gapplication/api", test_api); g_test_add_func ("/gapplication/api", test_api);
g_test_add_data_func ("/gapplication/replace", GINT_TO_POINTER (TRUE), test_replace); g_test_add_data_func ("/gapplication/replace", GINT_TO_POINTER (TRUE), test_replace);
g_test_add_data_func ("/gapplication/no-replace", GINT_TO_POINTER (FALSE), test_replace); g_test_add_data_func ("/gapplication/no-replace", GINT_TO_POINTER (FALSE), test_replace);