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

app: don't ask to confirm reverting "Untitled" when the image was imported

Browse Source
This commit is contained in:
Michael Natterer
2012-07-14 00:11:17 +02:00
parent afa81b5fbf
commit b0170ee5ea
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/actions/file-commands.c
View File

@ -378,8 +378,7 @@ file_revert_cmd_callback (GtkAction *action,
GimpDisplay *display; GimpDisplay *display;
GimpImage *image; GimpImage *image;
GtkWidget *dialog; GtkWidget *dialog;
const gchar *uri = NULL; const gchar *uri;
const gchar *source = NULL;
return_if_no_display (display, data); return_if_no_display (display, data);
image = gimp_display_get_image (display); image = gimp_display_get_image (display);
@ -387,14 +386,11 @@ file_revert_cmd_callback (GtkAction *action,
uri = gimp_image_get_uri (image); uri = gimp_image_get_uri (image);
if (! uri) if (! uri)
{ uri = gimp_image_get_imported_uri (image);
uri = gimp_image_get_imported_uri (image);
source = uri;
}
dialog = g_object_get_data (G_OBJECT (image), REVERT_DATA_KEY); dialog = g_object_get_data (G_OBJECT (image), REVERT_DATA_KEY);
if (! uri && ! source) if (! uri)
{ {
gimp_message_literal (image->gimp, gimp_message_literal (image->gimp,
G_OBJECT (display), GIMP_MESSAGE_ERROR, G_OBJECT (display), GIMP_MESSAGE_ERROR,
@ -434,11 +430,7 @@ file_revert_cmd_callback (GtkAction *action,
G_CALLBACK (file_revert_confirm_response), G_CALLBACK (file_revert_confirm_response),
display); display);
if (! source) basename = file_utils_uri_display_basename (uri);
basename = file_utils_uri_display_basename (uri);
else
basename = g_strdup (gimp_image_get_uri_or_untitled (image));
filename = file_utils_uri_display_name (uri); filename = file_utils_uri_display_name (uri);
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,