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

When failing to remove MIME DB attributes that don't exist, don't fail 

anymore. This concerned mimeset for instance. The Haiku build under
Haiku now gets a little further.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24618 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-03-28 07:45:16 +00:00
parent b564056dda
commit 0323066a2a
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/servers/registrar/mime/Database.cpp
View File

@ -954,6 +954,8 @@ Database::DeleteAppHint(const char *type)
status_t status = delete_attribute(type, kAppHintAttr); status_t status = delete_attribute(type, kAppHintAttr);
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_APP_HINT_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_APP_HINT_CHANGED, type, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -974,6 +976,8 @@ Database::DeleteAttrInfo(const char *type)
status_t status = delete_attribute(type, kAttrInfoAttr); status_t status = delete_attribute(type, kAttrInfoAttr);
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_ATTR_INFO_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_ATTR_INFO_CHANGED, type, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -994,6 +998,8 @@ Database::DeleteShortDescription(const char *type)
status_t status = delete_attribute(type, kShortDescriptionAttr); status_t status = delete_attribute(type, kShortDescriptionAttr);
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_SHORT_DESCRIPTION_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_SHORT_DESCRIPTION_CHANGED, type, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1014,6 +1020,8 @@ Database::DeleteLongDescription(const char *type)
status_t status = delete_attribute(type, kLongDescriptionAttr); status_t status = delete_attribute(type, kLongDescriptionAttr);
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_LONG_DESCRIPTION_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_LONG_DESCRIPTION_CHANGED, type, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1034,6 +1042,8 @@ Database::DeleteFileExtensions(const char *type)
status_t status = delete_attribute(type, kFileExtensionsAttr); status_t status = delete_attribute(type, kFileExtensionsAttr);
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_FILE_EXTENSIONS_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_FILE_EXTENSIONS_CHANGED, type, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1056,6 +1066,8 @@ Database::DeleteIcon(const char *type, icon_size which)
status_t status = delete_attribute(type, attr); status_t status = delete_attribute(type, attr);
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_ICON_CHANGED, type, which, B_META_MIME_DELETED); _SendMonitorUpdate(B_ICON_CHANGED, type, which, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1073,11 +1085,13 @@ Database::DeleteIcon(const char *type, icon_size which)
status_t status_t
Database::DeleteIcon(const char *type) Database::DeleteIcon(const char *type)
{ {
// TODO: exta notification for vector icon (uses B_LARGE_ICON now) // TODO: extra notification for vector icon (uses B_LARGE_ICON now)
status_t status = delete_attribute(type, kIconAttr); status_t status = delete_attribute(type, kIconAttr);
if (status == B_OK) if (status == B_OK) {
_SendMonitorUpdate(B_ICON_CHANGED, type, B_LARGE_ICON, _SendMonitorUpdate(B_ICON_CHANGED, type, B_LARGE_ICON,
B_META_MIME_DELETED); B_META_MIME_DELETED);
} else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1111,7 +1125,8 @@ Database::DeleteIconForType(const char *type, const char *fileType, icon_size wh
if (status == B_OK) { if (status == B_OK) {
_SendMonitorUpdate(B_ICON_FOR_TYPE_CHANGED, type, fileType, _SendMonitorUpdate(B_ICON_FOR_TYPE_CHANGED, type, fileType,
which == B_LARGE_ICON, B_META_MIME_DELETED); which == B_LARGE_ICON, B_META_MIME_DELETED);
} } else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1145,7 +1160,8 @@ Database::DeleteIconForType(const char *type, const char *fileType)
if (status == B_OK) { if (status == B_OK) {
_SendMonitorUpdate(B_ICON_FOR_TYPE_CHANGED, type, fileType, _SendMonitorUpdate(B_ICON_FOR_TYPE_CHANGED, type, fileType,
true, B_META_MIME_DELETED); true, B_META_MIME_DELETED);
} } else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1181,6 +1197,8 @@ Database::DeletePreferredApp(const char *type, app_verb verb)
*/ */
if (status == B_OK) if (status == B_OK)
_SendMonitorUpdate(B_PREFERRED_APP_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_PREFERRED_APP_CHANGED, type, B_META_MIME_DELETED);
else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1200,10 +1218,14 @@ status_t
Database::DeleteSnifferRule(const char *type) Database::DeleteSnifferRule(const char *type)
{ {
status_t status = delete_attribute(type, kSnifferRuleAttr); status_t status = delete_attribute(type, kSnifferRuleAttr);
if (status == B_OK) if (status == B_OK) {
status = fSnifferRules.DeleteSnifferRule(type); status = fSnifferRules.DeleteSnifferRule(type);
if (status == B_OK) if (status == B_OK) {
_SendMonitorUpdate(B_SNIFFER_RULE_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_SNIFFER_RULE_CHANGED, type,
B_META_MIME_DELETED);
}
} else if (status == B_ENTRY_NOT_FOUND)
status = B_OK;
return status; return status;
} }
@ -1233,13 +1255,19 @@ Database::DeleteSupportedTypes(const char *type, bool fullSync)
// do so even if the supported types attribute didn't exist, as // do so even if the supported types attribute didn't exist, as
// stranded types *may* exist in the database due to previous // stranded types *may* exist in the database due to previous
// calls to {Set,Delete}SupportedTypes() with fullSync == false. // calls to {Set,Delete}SupportedTypes() with fullSync == false.
bool sendUpdate = true;
if (status == B_OK) if (status == B_OK)
status = fSupportingApps.DeleteSupportedTypes(type, fullSync); status = fSupportingApps.DeleteSupportedTypes(type, fullSync);
else if (fullSync && status == B_ENTRY_NOT_FOUND) else if (status == B_ENTRY_NOT_FOUND) {
status = B_OK;
if (fullSync)
fSupportingApps.DeleteSupportedTypes(type, fullSync); fSupportingApps.DeleteSupportedTypes(type, fullSync);
else
sendUpdate = false;
}
// Send a monitor notification // Send a monitor notification
if (status == B_OK) if (status == B_OK && sendUpdate)
_SendMonitorUpdate(B_SUPPORTED_TYPES_CHANGED, type, B_META_MIME_DELETED); _SendMonitorUpdate(B_SUPPORTED_TYPES_CHANGED, type, B_META_MIME_DELETED);
return status; return status;