From b13aded024346f47626d6db7abf7549fbb4c6875 Mon Sep 17 00:00:00 2001 From: William Skaggs Date: Sun, 26 Dec 2004 17:11:31 +0000 Subject: [PATCH] Bill Skaggs * app/actions/documents-commands.c * app/actions/file-commands.c * app/dialogs/file-open-dialog.c * app/dialogs/file-open-location-dialog.c * app/display/gimpdisplayshell-dnd.c * app/widgets/gimplayertreeview.c * app/widgets/gimptoolbox-dnd.c: undo changes of 12-24, in favor of a better fix. * app/widgets/gimperrordialog.c: fix bug #162147 properly, as suggested by mitch. --- app/actions/documents-commands.c | 4 ---- app/actions/file-commands.c | 3 --- app/dialogs/file-open-dialog.c | 7 ------- app/dialogs/file-open-location-dialog.c | 4 ---- app/display/gimpdisplayshell-dnd.c | 4 ---- app/widgets/gimperrordialog.c | 2 +- app/widgets/gimplayertreeview.c | 4 ---- app/widgets/gimptoolbox-dnd.c | 4 ---- 8 files changed, 1 insertion(+), 31 deletions(-) diff --git a/app/actions/documents-commands.c b/app/actions/documents-commands.c index 2eb177dfaf..84fb9775c0 100644 --- a/app/actions/documents-commands.c +++ b/app/actions/documents-commands.c @@ -246,12 +246,8 @@ documents_open_image (GimpContext *context, if (! gimage && status != GIMP_PDB_CANCEL) { gchar *filename; - gchar *p; filename = file_utils_uri_to_utf8_filename (uri); - while ( (p = strchr (filename, '%')) ) - *p = ' '; - g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); g_clear_error (&error); diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c index 5430ea355d..0d1abf4ff8 100644 --- a/app/actions/file-commands.c +++ b/app/actions/file-commands.c @@ -156,12 +156,9 @@ file_last_opened_cmd_callback (GtkAction *action, if (! gimage && status != GIMP_PDB_CANCEL) { gchar *filename; - gchar *p; filename = file_utils_uri_to_utf8_filename (GIMP_OBJECT (imagefile)->name); - while ( (p = strchr (filename, '%')) ) - *p = ' '; g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); diff --git a/app/dialogs/file-open-dialog.c b/app/dialogs/file-open-dialog.c index 5a39cf9cca..92e0f92fc3 100644 --- a/app/dialogs/file-open-dialog.c +++ b/app/dialogs/file-open-dialog.c @@ -177,7 +177,6 @@ file_open_dialog_open_image (GtkWidget *open_dialog, GimpImage *gimage; GimpPDBStatusType status; GError *error = NULL; - gchar *p; gimage = file_open_with_proc_and_display (gimp, gimp_get_user_context (gimp), @@ -195,8 +194,6 @@ file_open_dialog_open_image (GtkWidget *open_dialog, else if (status != GIMP_PDB_CANCEL) { gchar *filename = file_utils_uri_to_utf8_filename (uri); - while ( (p = strchr (filename, '%')) ) - *p = ' '; g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); @@ -248,10 +245,6 @@ file_open_dialog_open_layer (GtkWidget *open_dialog, else if (status != GIMP_PDB_CANCEL) { gchar *filename = file_utils_uri_to_utf8_filename (uri); - gchar *p; - - while ( (p = strchr (filename, '%')) ) - *p = ' '; g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c index 53271134a5..620073d823 100644 --- a/app/dialogs/file-open-location-dialog.c +++ b/app/dialogs/file-open-location-dialog.c @@ -189,10 +189,6 @@ file_open_location_response (GtkDialog *dialog, if (image == NULL && status != GIMP_PDB_CANCEL) { gchar *filename = file_utils_uri_to_utf8_filename (uri); - gchar *p; - - while ( (p = strchr (filename, '%')) ) - *p = ' '; g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c index edad6d3c26..2e99feb159 100644 --- a/app/display/gimpdisplayshell-dnd.c +++ b/app/display/gimpdisplayshell-dnd.c @@ -329,12 +329,8 @@ gimp_display_shell_drop_uri_list (GtkWidget *widget, } else if (status != GIMP_PDB_CANCEL) { - gchar *p; gchar *filename = file_utils_uri_to_utf8_filename (uri); - while ( (p = strchr (filename, '%')) ) - *p = ' '; - g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); diff --git a/app/widgets/gimperrordialog.c b/app/widgets/gimperrordialog.c index 8b85545365..98646bb5a8 100644 --- a/app/widgets/gimperrordialog.c +++ b/app/widgets/gimperrordialog.c @@ -251,7 +251,7 @@ gimp_error_dialog_add (GimpErrorDialog *dialog, gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), _("%s Message"), domain); - gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), message); + gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", message); gtk_container_add (GTK_CONTAINER (dialog->vbox), box); gtk_widget_show (box); diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 6d93d128a1..8657aae44d 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -799,12 +799,8 @@ gimp_layer_tree_view_drop_uri_list (GimpContainerTreeView *view, } else if (status != GIMP_PDB_CANCEL) { - gchar *p; gchar *filename = file_utils_uri_to_utf8_filename (uri); - while ( (p = strchr (filename, '%')) ) - *p = ' '; - g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message); diff --git a/app/widgets/gimptoolbox-dnd.c b/app/widgets/gimptoolbox-dnd.c index 33bb0f546f..041419f6c1 100644 --- a/app/widgets/gimptoolbox-dnd.c +++ b/app/widgets/gimptoolbox-dnd.c @@ -121,10 +121,6 @@ gimp_toolbox_drop_uri_list (GtkWidget *widget, if (! gimage && status != GIMP_PDB_CANCEL) { gchar *filename = file_utils_uri_to_utf8_filename (uri); - gchar *p; - - while ( (p = strchr (filename, '%')) ) - *p = ' '; g_message (_("Opening '%s' failed:\n\n%s"), filename, error->message);