Commit b13aded0 authored by William Skaggs's avatar William Skaggs
Browse files

Bill Skaggs <weskaggs@primate.ucdavis.edu>

	* 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.
parent 80074a4a
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment