dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file-open-location: create only one progress bar

This commit is contained in:
Edward E 2018-03-31 11:48:18 -05:00 committed by Michael Natterer
parent fd6d4931c8
commit 33b7d8e334
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/dialogs/file-open-location-dialog.c
View File

@ -149,10 +149,10 @@ file_open_location_response (GtkDialog *dialog,
GtkWidget *box;
const gchar *text = NULL;
box = g_object_get_data (G_OBJECT (dialog), "progress-box");
if (response_id != GTK_RESPONSE_OK)
{
box = g_object_get_data (G_OBJECT (dialog), "progress-box");
if (box && GIMP_PROGRESS_BOX (box)->active)
gimp_progress_cancel (GIMP_PROGRESS (box));
else
@ -188,12 +188,15 @@ file_open_location_response (GtkDialog *dialog,
file = file_utils_filename_to_file (gimp, text, &error);
}
box = gimp_progress_box_new ();
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
box, FALSE, FALSE, 0);
if (!box)
{
box = gimp_progress_box_new ();
gtk_container_set_border_width (GTK_CONTAINER (box), 12);
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
box, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (dialog), "progress-box", box);
g_object_set_data (G_OBJECT (dialog), "progress-box", box);
}
if (file)
{