[gedit] Make sure error_message is always set. Spotted by Matthias Clasen.
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Make sure error_message is always set. Spotted by Matthias Clasen.
- Date: Mon, 8 Mar 2010 21:14:49 +0000 (UTC)
commit 3c83973e9f4a6fa586b17dc4975e95fbba51e085
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Mar 8 22:11:48 2010 +0100
Make sure error_message is always set. Spotted by Matthias Clasen.
gedit/gedit-io-error-message-area.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/gedit/gedit-io-error-message-area.c b/gedit/gedit-io-error-message-area.c
index 09d687c..5869019 100644
--- a/gedit/gedit-io-error-message-area.c
+++ b/gedit/gedit-io-error-message-area.c
@@ -433,8 +433,10 @@ gedit_unrecoverable_reverting_error_message_area_new (const gchar *uri,
}
if (error_message == NULL)
+ {
error_message = g_strdup_printf (_("Could not revert the file %s."),
uri_for_display);
+ }
message_area = create_io_loading_error_message_area (error_message,
message_details,
@@ -645,11 +647,9 @@ gedit_io_loading_error_message_area_new (const gchar *uri,
(error->domain == GEDIT_DOCUMENT_ERROR &&
error->code == GEDIT_DOCUMENT_ERROR_ENCODING_AUTO_DETECTION_FAILED))
{
- error_message = g_strdup_printf (_("Could not open the file %s."),
- uri_for_display);
message_details = g_strconcat (_("gedit has not been able to detect "
- "the character encoding."), "\n",
- _("Please check that you are not trying to open a binary file."), "\n",
+ "the character encoding."), "\n",
+ _("Please check that you are not trying to open a binary file."), "\n",
_("Select a character encoding from the menu and try again."), NULL);
convert_error = TRUE;
}
@@ -680,6 +680,12 @@ gedit_io_loading_error_message_area_new (const gchar *uri,
parse_error (error, &error_message, &message_details, uri, uri_for_display);
}
+ if (error_message == NULL)
+ {
+ error_message = g_strdup_printf (_("Could not open the file %s."),
+ uri_for_display);
+ }
+
if (convert_error)
{
message_area = create_conversion_error_message_area (error_message,
@@ -1194,8 +1200,10 @@ gedit_unrecoverable_saving_error_message_area_new (const gchar *uri,
}
if (error_message == NULL)
+ {
error_message = g_strdup_printf (_("Could not save the file %s."),
uri_for_display);
+ }
message_area = create_io_loading_error_message_area (error_message,
message_details,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]