Commit 64b8133c authored by Pavel Cisler's avatar Pavel Cisler Committed by Pavel Cisler

reviewed by: Mathieu Lacage <mathieu@eazel.com>

2000-11-21  Pavel Cisler  <pavel@eazel.com>

	reviewed by: Mathieu Lacage  <mathieu@eazel.com>

	* libnautilus-extensions/nautilus-file-operations.c:
	(handle_xfer_vfs_error):
	Fixed 4486 and 3748. Made the file copy operation error dialog
	have a non-misleading title if the title actually shows up (it
	is not supposed to but it may due to window manager theme bugs).
	Made the error text for copying into non-writeable dialogs more
	accurate.
parent 696070cf
2000-11-21 Pavel Cisler <pavel@eazel.com>
reviewed by: Mathieu Lacage <mathieu@eazel.com>
* libnautilus-extensions/nautilus-file-operations.c:
(handle_xfer_vfs_error):
Fixed 4486 and 3748. Made the file copy operation error dialog
have a non-misleading title if the title actually shows up (it
is not supposed to but it may due to window manager theme bugs).
Made the error text for copying into non-writeable dialogs more
accurate.
2000-11-21 Robey Pointer <robey@eazel.com>
* nautilus-installer/src/*.xpm:
......@@ -316,7 +328,7 @@
Fixed bug occuring when percentages of multi-point
add up to >100% (bug 4759)
2000-11-17 Mathieu Lacage <mathieu@eazel.om>
2000-11-17 Mathieu Lacage <mathieu@eazel.com>
reviewed by: Sullivan
......
......@@ -480,6 +480,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
char *text;
char *unescaped_name;
char *current_operation;
char *dialog_title;
switch (xfer_info->error_mode) {
case GNOME_VFS_XFER_ERROR_MODE_QUERY:
......@@ -498,6 +499,8 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
current_operation = g_strdup (xfer_info->progress_verb);
dialog_title = g_strdup_printf(_("Error while %s."), current_operation);
g_strdown (current_operation);
/* special case read only target errors or non-readable sources */
......@@ -518,7 +521,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
}
text = g_strdup_printf
(_("Error while %s items to \"%s\".\n"
"The destination is read-only."),
"The destination is not writable."),
current_operation, unescaped_name);
}
g_free (current_operation);
......@@ -526,7 +529,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(parent_for_error_dialog (xfer_info), TRUE, text,
_("Error while Copying"), _("Stop"), NULL);
dialog_title, _("Stop"), NULL);
g_free (text);
return GNOME_VFS_XFER_ERROR_ACTION_ABORT;
......@@ -544,7 +547,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(parent_for_error_dialog (xfer_info), TRUE, text,
_("Error while Copying"), _("Stop"), NULL);
dialog_title, _("Stop"), NULL);
g_free (text);
return GNOME_VFS_XFER_ERROR_ACTION_ABORT;
......@@ -561,10 +564,12 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(parent_for_error_dialog (xfer_info), TRUE, text,
_("Error while Copying"),
dialog_title,
_("Skip"), _("Retry"), _("Stop"), NULL);
g_free (text);
g_free (text);
g_free (dialog_title);
switch (result) {
case 0:
return GNOME_VFS_XFER_ERROR_ACTION_SKIP;
......
......@@ -480,6 +480,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
char *text;
char *unescaped_name;
char *current_operation;
char *dialog_title;
switch (xfer_info->error_mode) {
case GNOME_VFS_XFER_ERROR_MODE_QUERY:
......@@ -498,6 +499,8 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
current_operation = g_strdup (xfer_info->progress_verb);
dialog_title = g_strdup_printf(_("Error while %s."), current_operation);
g_strdown (current_operation);
/* special case read only target errors or non-readable sources */
......@@ -518,7 +521,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
}
text = g_strdup_printf
(_("Error while %s items to \"%s\".\n"
"The destination is read-only."),
"The destination is not writable."),
current_operation, unescaped_name);
}
g_free (current_operation);
......@@ -526,7 +529,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(parent_for_error_dialog (xfer_info), TRUE, text,
_("Error while Copying"), _("Stop"), NULL);
dialog_title, _("Stop"), NULL);
g_free (text);
return GNOME_VFS_XFER_ERROR_ACTION_ABORT;
......@@ -544,7 +547,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(parent_for_error_dialog (xfer_info), TRUE, text,
_("Error while Copying"), _("Stop"), NULL);
dialog_title, _("Stop"), NULL);
g_free (text);
return GNOME_VFS_XFER_ERROR_ACTION_ABORT;
......@@ -561,10 +564,12 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(parent_for_error_dialog (xfer_info), TRUE, text,
_("Error while Copying"),
dialog_title,
_("Skip"), _("Retry"), _("Stop"), NULL);
g_free (text);
g_free (text);
g_free (dialog_title);
switch (result) {
case 0:
return GNOME_VFS_XFER_ERROR_ACTION_SKIP;
......
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