From 902fd96ce2de5be78ae2d301c96766acbf5aa697 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 26 Jan 2014 13:42:03 +0100 Subject: [PATCH] MimeInfoUpdater: Don't touch the MIME DB Use the new SetIconForType() and SetSupportedTypes() versions and request the MIME DB not to be updated. This changes the update_mime_info() and mimeset (without -a/-A) behavior in that they only modify the (application) file attributes, now. Addresses #10453. --- src/kits/storage/mime/MimeInfoUpdater.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/kits/storage/mime/MimeInfoUpdater.cpp b/src/kits/storage/mime/MimeInfoUpdater.cpp index 7fb14ef129..3b65ef296e 100644 --- a/src/kits/storage/mime/MimeInfoUpdater.cpp +++ b/src/kits/storage/mime/MimeInfoUpdater.cpp @@ -36,9 +36,9 @@ update_icon(BAppFileInfo &appFileInfoRead, BAppFileInfo &appFileInfoWrite, { status_t err = appFileInfoRead.GetIconForType(type, &icon, iconSize); if (err == B_OK) - err = appFileInfoWrite.SetIconForType(type, &icon, iconSize); + err = appFileInfoWrite.SetIconForType(type, &icon, iconSize, false); else if (err == B_ENTRY_NOT_FOUND) - err = appFileInfoWrite.SetIconForType(type, NULL, iconSize); + err = appFileInfoWrite.SetIconForType(type, NULL, iconSize, false); return err; } @@ -52,9 +52,9 @@ update_icon(BAppFileInfo &appFileInfoRead, BAppFileInfo &appFileInfoWrite, status_t err = appFileInfoRead.GetIconForType(type, &data, &size); if (err == B_OK) - err = appFileInfoWrite.SetIconForType(type, data, size); + err = appFileInfoWrite.SetIconForType(type, data, size, false); else if (err == B_ENTRY_NOT_FOUND) - err = appFileInfoWrite.SetIconForType(type, NULL, size); + err = appFileInfoWrite.SetIconForType(type, NULL, size, false); free(data); @@ -177,10 +177,11 @@ MimeInfoUpdater::Do(const entry_ref& entry, bool* _entryIsDir) bool hasSupportedTypes = false; err = appFileInfoRead.GetSupportedTypes(&supportedTypes); if (err == B_OK) { - err = appFileInfoWrite.SetSupportedTypes(&supportedTypes); + err = appFileInfoWrite.SetSupportedTypes(&supportedTypes, false, + false); hasSupportedTypes = true; } else if (err == B_ENTRY_NOT_FOUND) - err = appFileInfoWrite.SetSupportedTypes(NULL); + err = appFileInfoWrite.SetSupportedTypes(NULL, false, false); if (err != B_OK) return err;