Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MimeInfoUpdater: Don't touch the MIME DB

Browse Source 
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.
This commit is contained in:
Ingo Weinhold 2014-01-26 13:42:03 +01:00
parent 0973f2a791
commit 902fd96ce2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kits/storage/mime/MimeInfoUpdater.cpp
View File

@ -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;