callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

color picker portal: Add request path utility

Browse Source 
Less code duplication, more cake!
This commit is contained in:
Matthias Clasen
2018-08-30 13:11:51 -04:00
parent 6829719d6d
commit e2d066a2ec
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkcolorpickerportal.c
View File

@ -178,11 +178,9 @@ gtk_color_picker_portal_pick (GtkColorPicker *cp,
{ {
GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (cp); GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (cp);
GVariantBuilder options; GVariantBuilder options;
char *token;
GDBusConnection *connection; GDBusConnection *connection;
char *sender; char *token;
char *handle; char *handle;
int i;
if (picker->task) if (picker->task)
return; return;
@ -191,13 +189,7 @@ gtk_color_picker_portal_pick (GtkColorPicker *cp,
connection = g_dbus_proxy_get_connection (picker->portal_proxy); connection = g_dbus_proxy_get_connection (picker->portal_proxy);
token = g_strdup_printf ("gtk%d", g_random_int_range (0, G_MAXINT)); handle = gtk_get_portal_request_path (connection, &token);
sender = g_strdup (g_dbus_connection_get_unique_name (connection) + 1);
for (i = 0; sender[i]; i++)
if (sender[i] == '.')
sender[i] = '_';
handle = g_strdup_printf ("/org/freedesktop/portal/desktop/request/%s/%s", sender, token);
picker->portal_signal_id = g_dbus_connection_signal_subscribe (connection, picker->portal_signal_id = g_dbus_connection_signal_subscribe (connection,
"org.freedesktop.portal.Desktop", "org.freedesktop.portal.Desktop",
"org.freedesktop.portal.Request", "org.freedesktop.portal.Request",
@ -210,7 +202,6 @@ gtk_color_picker_portal_pick (GtkColorPicker *cp,
NULL); NULL);
g_free (handle); g_free (handle);
g_free (sender);
g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT); g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add (&options, "{sv}", "handle_token", g_variant_new_string (token)); g_variant_builder_add (&options, "{sv}", "handle_token", g_variant_new_string (token));