pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-02 22:47:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rather than adding a default extension to screenshots, display an error message to make the user add it.

Browse Source 
This prevents the silent overwriting of the file, and still makes sure the user knows why we don't proceed.

Fix BZ#1752514

Signed-off-by: Julien Ropé <jrope@redhat.com>
This commit is contained in:
Julien Ropé 2020-06-09 14:44:39 +02:00
parent fedaa5f89a
commit c6afc28cc9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/virt-viewer-window.c
View File

@ -1085,17 +1085,22 @@ virt_viewer_window_menu_file_screenshot(GtkWidget *menu G_GNUC_UNUSED,
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), image_dir);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), _("Screenshot.png"));
retry_dialog:
if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
char *filename;
GError *error = NULL;
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (dialog));
if (g_strrstr(filename, ".") == NULL) {
// no extension provided: add the .png default
char *tmp_filename ;
tmp_filename = g_strdup_printf("%s.png", filename) ;
g_free(filename) ;
filename = tmp_filename ;
// no extension provided
GtkWidget *msg_dialog ;
g_free(filename);
msg_dialog = gtk_message_dialog_new (GTK_WINDOW(dialog), GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
_("Please add an extension to the file name"));
gtk_dialog_run(GTK_DIALOG(msg_dialog));
gtk_widget_destroy(msg_dialog);
goto retry_dialog;
}
if (!virt_viewer_window_save_screenshot(self, filename, &error)) {