diff options
author | Matthias Clasen <mclasen@redhat.com> | 2018-08-30 13:11:51 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2018-08-30 22:53:36 -0400 |
commit | 6d6559f982998c469aed211c2803d9639e0cdd86 (patch) | |
tree | 42d2bdcd4d0b011c5048779260e1629fd06afed4 | |
parent | b271db253f307bcab7651434502dcb1e27b905dd (diff) | |
download | gtk+-6d6559f982998c469aed211c2803d9639e0cdd86.tar.gz |
color picker portal: Add request path utility
Less code duplication, more cake!
-rw-r--r-- | gtk/gtkcolorpickerportal.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk/gtkcolorpickerportal.c b/gtk/gtkcolorpickerportal.c index 90a7b2dbc7..3198545a0b 100644 --- a/gtk/gtkcolorpickerportal.c +++ b/gtk/gtkcolorpickerportal.c @@ -178,11 +178,9 @@ gtk_color_picker_portal_pick (GtkColorPicker *cp, { GtkColorPickerPortal *picker = GTK_COLOR_PICKER_PORTAL (cp); GVariantBuilder options; - char *token; GDBusConnection *connection; - char *sender; + char *token; char *handle; - int i; if (picker->task) return; @@ -191,13 +189,7 @@ gtk_color_picker_portal_pick (GtkColorPicker *cp, connection = g_dbus_proxy_get_connection (picker->portal_proxy); - token = g_strdup_printf ("gtk%d", g_random_int_range (0, G_MAXINT)); - sender = g_strdup (g_dbus_connection_get_unique_name (connection) + 1); - for (i = 0; sender[i]; i++) - if (sender[i] == '.') - sender[i] = '_'; - - handle = g_strconcat (PORTAL_OBJECT_PATH "/request/", sender, "/", token, NULL); + handle = gtk_get_portal_request_path (connection, &token); picker->portal_signal_id = g_dbus_connection_signal_subscribe (connection, PORTAL_BUS_NAME, PORTAL_REQUEST_INTERFACE, @@ -210,7 +202,6 @@ gtk_color_picker_portal_pick (GtkColorPicker *cp, NULL); g_free (handle); - g_free (sender); g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT); g_variant_builder_add (&options, "{sv}", "handle_token", g_variant_new_string (token)); |