p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix default filenames in the "Save as" dialog 

- Don't assume the filesystem is in UTF-8.
 - Don't try to extract basenames directly from URIs.
This commit is contained in:
Přemysl Eric Janouch 2022-08-05 03:16:29 +02:00
parent d590d1da46
commit bb669743b6
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fiv-view.c
View File

@ -1095,24 +1095,24 @@ save_as(FivView *self, cairo_surface_t *frame)
gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE); gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
GFile *file = g_file_new_for_uri(self->uri); GFile *file = g_file_new_for_uri(self->uri);
const gchar *path = g_file_peek_path(file); GFileInfo *info =
// TODO(p): Use g_file_info_get_display_name(). g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
gchar *basename = g_filename_display_basename(path ? path : self->uri); G_FILE_QUERY_INFO_NONE, NULL, NULL);
// Note that GTK+'s save dialog is too stupid to automatically change // Note that GTK+'s save dialog is too stupid to automatically change
// the extension when user changes the filter. Presumably, // the extension when user changes the filter. Presumably,
// gtk_file_chooser_set_extra_widget() can be used to circumvent this. // gtk_file_chooser_set_extra_widget() can be used to circumvent this.
gchar *name = const char *basename = info ? g_file_info_get_display_name(info) : "image";
g_strdup_printf(frame ? "%s.frame.webp" : "%s.webp", basename); gchar *name = g_strconcat(basename, frame ? "-frame.webp" : ".webp", NULL);
gtk_file_chooser_set_current_name(chooser, name); gtk_file_chooser_set_current_name(chooser, name);
g_free(name); g_free(name);
if (path) { if (g_file_peek_path(file)) {
gchar *dirname = g_path_get_dirname(path); GFile *parent = g_file_get_parent(file);
gtk_file_chooser_set_current_folder(chooser, dirname); (void) gtk_file_chooser_set_current_folder_file(chooser, parent, NULL);
g_free(dirname); g_object_unref(parent);
} }
g_free(basename);
g_object_unref(file); g_object_unref(file);
g_clear_object(&info);
// This is the best general format: supports lossless encoding, animations, // This is the best general format: supports lossless encoding, animations,
// alpha channel, and Exif and ICC profile metadata. // alpha channel, and Exif and ICC profile metadata.