2 files changed, 2 insertions, 8 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 2896cb9d..5c7bfec8 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -1052,11 +1052,11 @@ show_dialog:
 {
 media_greeting = _("You have just inserted a blank DVD.");
 }
- else if (strcmp (x_content_type, "x-content/blank-cd") == 0)
+ else if (strcmp (x_content_type, "x-content/blank-bd") == 0)
 {
 media_greeting = _("You have just inserted a blank Blu-Ray disc.");
 }
- else if (strcmp (x_content_type, "x-content/blank-cd") == 0)
+ else if (strcmp (x_content_type, "x-content/blank-hddvd") == 0)
 {
 media_greeting = _("You have just inserted a blank HD DVD.");
 }
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index 04ee81ab..35ddf81e 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -4815,12 +4815,6 @@ move_file_prepare (CopyMoveJob *move_job,
 response->new_name);
 conflict_response_data_free (response);
 goto retry;
- } else if (response->id == CONFLICT_RESPONSE_RENAME) {
- g_object_unref (dest);
- dest = get_target_file_for_display_name (dest_dir,
- response->new_name);
- conflict_response_data_free (response);
- goto retry;
 } else {
 g_assert_not_reached ();
 }