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

selection: Use the right mime type

Browse Source 
The correct mime type for portal file transfers
is application/vnd.portal.filetransfer.

Fixes: #5643
This commit is contained in:
Matthias Clasen 2023-03-06 23:06:15 -05:00
parent b2d761f706
commit 5fee632386
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkselection.c
View File

@ -343,6 +343,7 @@ static GdkAtom text_plain_utf8_atom;
static GdkAtom text_plain_locale_atom; static GdkAtom text_plain_locale_atom;
static GdkAtom text_uri_list_atom; static GdkAtom text_uri_list_atom;
static GdkAtom portal_files_atom; static GdkAtom portal_files_atom;
static GdkAtom portal_filetransfer_atom;
static void static void
init_atoms (void) init_atoms (void)
@ -364,6 +365,7 @@ init_atoms (void)
text_uri_list_atom = gdk_atom_intern_static_string ("text/uri-list"); text_uri_list_atom = gdk_atom_intern_static_string ("text/uri-list");
portal_files_atom = gdk_atom_intern_static_string ("application/vnd.portal.files"); portal_files_atom = gdk_atom_intern_static_string ("application/vnd.portal.files");
portal_filetransfer_atom = gdk_atom_intern_static_string ("application/vnd.portal.filetransfer");
} }
} }
@ -526,7 +528,10 @@ gtk_target_list_add_uri_targets (GtkTargetList *list,
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
if (file_transfer_portal_supported ()) if (file_transfer_portal_supported ())
gtk_target_list_add (list, portal_files_atom, 0, info); {
gtk_target_list_add (list, portal_filetransfer_atom, 0, info);
gtk_target_list_add (list, portal_files_atom, 0, info);
}
#endif #endif
} }
@ -1899,7 +1904,8 @@ gtk_selection_data_set_uris (GtkSelectionData *selection_data,
} }
} }
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
else if (selection_data->target == portal_files_atom && else if ((selection_data->target == portal_filetransfer_atom ||
selection_data->target == portal_files_atom) &&
file_transfer_portal_supported ()) file_transfer_portal_supported ())
{ {
GPtrArray *a; GPtrArray *a;
@ -1940,7 +1946,7 @@ gtk_selection_data_set_uris (GtkSelectionData *selection_data,
} }
gtk_selection_data_set (selection_data, gtk_selection_data_set (selection_data,
portal_files_atom, selection_data->target,
8, (guchar *)key, strlen (key)); 8, (guchar *)key, strlen (key));
g_strfreev (files); g_strfreev (files);
@ -1996,7 +2002,8 @@ gtk_selection_data_get_uris (const GtkSelectionData *selection_data)
} }
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
else if (selection_data->length >= 0 && else if (selection_data->length >= 0 &&
selection_data->type == portal_files_atom && (selection_data->type == portal_filetransfer_atom ||
selection_data->type == portal_files_atom) &&
file_transfer_portal_supported ()) file_transfer_portal_supported ())
{ {
char *key; char *key;
@ -2353,6 +2360,7 @@ gtk_targets_include_uri (GdkAtom *targets,
for (i = 0; i < n_targets; i++) for (i = 0; i < n_targets; i++)
{ {
if (targets[i] == text_uri_list_atom || if (targets[i] == text_uri_list_atom ||
targets[i] == portal_filetransfer_atom ||
targets[i] == portal_files_atom) targets[i] == portal_files_atom)
{ {
result = TRUE; result = TRUE;