Changeset 17836

Timestamp:

06/14/06 08:31:46 (2 years ago)

Author:

axeld

Message:

* No need to create a BPath object for the leaf name in CreateAppMetaMimeThread.
* The preferred application is now written with the case preserved. This fixes

bug #635.

* Minor cleanup.
* BApplication::_InitData() now also corrects a pre-registered application signature

if the case is different. Note, however, that the application watching mechanism
doesn't seem to work correctly with this, maybe sending out those should be postponed
until the registration is completed?

Location:

haiku/trunk/src/kits

Files:

• app/Application.cpp (modified) (1 diff)
• storage/mime/CreateAppMetaMimeThread.cpp (modified) (3 diffs)

haiku/trunk/src/kits/app/Application.cpp

@@ -331 +331 @@
                 } else
                         appInfo.port = fMsgPort;
-                // check the signature and correct it, if necessary
-                if (strcasecmp(appInfo.signature, fAppName))
+                // check the signature and correct it, if necessary, also the case
+                if (strcmp(appInfo.signature, fAppName))
                         BRoster::Private().SetSignature(team, fAppName);
                 // complete the registration

haiku/trunk/src/kits/storage/mime/CreateAppMetaMimeThread.cpp

@@ -55 +55 @@
                 return status;
 
-        BPath path;
-        status = path.SetTo(ref);
-        if (status < B_OK)
-                return status;
-
         // Read the app sig (which consequently keeps us from updating
         // non-applications, since we get an error if the file has no
@@ -78 +73 @@
                 mime.Install();
 
-        signature.ToLower();
-                // Signatures and MIME types are case insensitive
+        BString path = "/";
+        path.Append(signature);
+        path.ToLower();
+                // Signatures and MIME types are case insensitive, but we want to
+                // preserve the case wherever possible
+        path.Prepend(kDatabaseDir.c_str());
 
-        char metaMimePath[B_PATH_NAME_LENGTH];
-        sprintf(metaMimePath, "%s/%s", kDatabaseDir.c_str(), signature.String());
-
-        status = typeNode.SetTo(metaMimePath);
+        status = typeNode.SetTo(path.String());
         if (status < B_OK)
                 return status;
@@ -90 +86 @@
         // Preferred App
         attr_info info;
-        if (status == B_OK && (fForce || typeNode.GetAttrInfo(kPreferredAppAttr, &info) != B_OK)) {
+        if (status == B_OK && (fForce || typeNode.GetAttrInfo(kPreferredAppAttr, &info) != B_OK))
                 status = mime.SetPreferredApp(signature.String());
-        }
+
         // Short Description (name of the application)
-        if (status == B_OK && (fForce || typeNode.GetAttrInfo(kShortDescriptionAttr, &info) != B_OK)) {
-                status = mime.SetShortDescription(path.Leaf());
-        }
+        if (status == B_OK && (fForce || typeNode.GetAttrInfo(kShortDescriptionAttr, &info) != B_OK))
+                status = mime.SetShortDescription(ref->name);
+
         // App Hint
-        if (status == B_OK && (fForce || typeNode.GetAttrInfo(kAppHintAttr, &info) != B_OK)) {
+        if (status == B_OK && (fForce || typeNode.GetAttrInfo(kAppHintAttr, &info) != B_OK))
                 status = mime.SetAppHint(ref);
-        }
 
         // Mini Icon