Changeset 24618

Timestamp:

03/28/08 02:45:16 (2 months ago)

Author:

bonefish

Message:

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.

Files:

• haiku/trunk/src/servers/registrar/mime/Database.cpp (modified) (12 diffs)

haiku/trunk/src/servers/registrar/mime/Database.cpp

@@ -955 +955 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_APP_HINT_CHANGED, type, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -975 +977 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_ATTR_INFO_CHANGED, type, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -995 +999 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_SHORT_DESCRIPTION_CHANGED, type, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -1015 +1021 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_LONG_DESCRIPTION_CHANGED, type, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -1035 +1043 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_FILE_EXTENSIONS_CHANGED, type, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -1057 +1067 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_ICON_CHANGED, type, which, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -1074 +1086 @@
-Database::DeleteIcon(const char *type)
-{
-
+r
-        status_t status = delete_attribute(type, kIconAttr);
-
+ {
-                _SendMonitorUpdate(B_ICON_CHANGED, type, B_LARGE_ICON,
-                                                   B_META_MIME_DELETED);
+        } else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -1112 +1126 @@
-                _SendMonitorUpdate(B_ICON_FOR_TYPE_CHANGED, type, fileType,
-                        which == B_LARGE_ICON, B_META_MIME_DELETED);
-
+
+
-
-        return status;
@@ -1146 +1161 @@
-                _SendMonitorUpdate(B_ICON_FOR_TYPE_CHANGED, type, fileType,
-                        true, B_META_MIME_DELETED);
-
+
+
-
-        return status;
@@ -1182 +1198 @@
-        if (status == B_OK)
-                _SendMonitorUpdate(B_PREFERRED_APP_CHANGED, type, B_META_MIME_DELETED);
+        else if (status == B_ENTRY_NOT_FOUND)
+                status = B_OK;
-
-        return status;
@@ -1201 +1219 @@
-{
-        status_t status = delete_attribute(type, kSnifferRuleAttr);
-
+ {
-                status = fSnifferRules.DeleteSnifferRule(type);
-
-
+
+
+
+
+
+
-
-        return status;
@@ -1234 +1256 @@
-        // stranded types *may* exist in the database due to previous
-        // calls to {Set,Delete}SupportedTypes() with fullSync == false.
+        bool sendUpdate = true;
-        if (status == B_OK)
-                status = fSupportingApps.DeleteSupportedTypes(type, fullSync);
-
-
+
+
+
+
+
+
+
-
-        // Send a monitor notification
-
+ && sendUpdate
-                _SendMonitorUpdate(B_SUPPORTED_TYPES_CHANGED, type, B_META_MIME_DELETED);
-