diff options
| author | David Bordoley <bordoley@msu.edu> | 2003-02-03 16:16:52 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2003-02-03 16:16:52 +0000 |
| commit | bfc25789ed14570af5de76fa8cb710ca32ebf3c3 (patch) | |
| tree | 05713a45f95a5af800c6677f0217b1d0d1fdab79 /libnautilus-private/nautilus-file-operations.c | |
| parent | 0dcfe7ee625868a7a7f6107bbc0dd1aa277547ef (diff) | |
| download | nautilus-bfc25789ed14570af5de76fa8cb710ca32ebf3c3.tar.gz | |
Fixed dialogs to use GTK_STOCK_CANCEL/GTK_STOCK_OK instead of stop where
2003-02-03 David Bordoley <bordoley@msu.edu>
* lbnautilus-private/nautilus-file-operations.c
(handle_transfer_vfs_error):
Fixed dialogs to use GTK_STOCK_CANCEL/GTK_STOCK_OK
instead of stop where appropriate. Fix button order to be
HIG compliant.
Diffstat (limited to 'libnautilus-private/nautilus-file-operations.c')
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index f6f6c9c92..021172575 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -800,7 +800,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info, switch (transfer_info->error_mode) { case GNOME_VFS_XFER_ERROR_MODE_QUERY: - /* transfer error, prompt the user to continue or stop */ + /* transfer error, prompt the user to continue or cancel */ /* stop timeout while waiting for user */ nautilus_file_operations_progress_pause_timeout (transfer_info->progress_dialog); @@ -911,7 +911,7 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info, error_kind == ERROR_SOURCE_IN_TARGET) { /* We can't continue, just tell the user. */ eel_run_simple_dialog (parent_for_error_dialog (transfer_info), - TRUE, text, dialog_title, _("Stop"), NULL); + TRUE, text, dialog_title, GTK_STOCK_OK, NULL); error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT; } else if ((error_location == ERROR_LOCATION_SOURCE @@ -926,16 +926,16 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info, error_dialog_button_pressed = eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text, dialog_title, - _("Skip"), _("Stop"), NULL); + GTK_STOCK_CANCEL, _("Skip"), NULL); switch (error_dialog_button_pressed) { case 0: - error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_SKIP; - break; - case 1: case GTK_RESPONSE_DELETE_EVENT: error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT; break; + case 1: + error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_SKIP; + break; default: g_assert_not_reached (); error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT; @@ -946,17 +946,17 @@ handle_transfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info, error_dialog_button_pressed = eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text, dialog_title, - _("Skip"), _("Retry"), _("Stop"), NULL); + _("Skip"), GTK_STOCK_CANCEL, _("Retry"), NULL); switch (error_dialog_button_pressed) { case 0: error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_SKIP; break; case 1: - error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_RETRY; + error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT; break; case 2: - error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_ABORT; + error_dialog_result = GNOME_VFS_XFER_ERROR_ACTION_RETRY; break; default: g_assert_not_reached (); |