456892 - Removal TopLevelWindowIsModal

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Jonathan Steele]

I would like somebody else to remove any OS 9 code because it is unused and dead. There is a few under under the xpcom and xpfe directory.

Comment 1

[Jonathan Steele]

Since I didn't give a specfic one but i found these two

1) http://mxr.mozilla.org/mozilla-central/source/xpfe/appshell/src/nsAppShellService.cpp#551

2) http://mxr.mozilla.org/mozilla-central/source/xpcom/MoreFiles/MoreFilesX.c#84

I believe there is more than these two that I didn't find.

Comment 2

[Jonathan Steele]

Attachment: Removal under xpfe

Comment 3

[[e-mail]]

Comment on attachment 340384 [details] [diff] [review]
Removal under xpfe

>-/* Old function, needs to be removed... it was only used on Mac OS9 */
>-NS_IMETHODIMP
>-nsAppShellService::TopLevelWindowIsModal(nsIXULWindow *aWindow, PRBool aModal)
>-{
>-  return NS_OK;
>-}
You need to remove the declaration (in nsIAppShellService.idl, and don't forget to create a new uuid).

>   mContinueModalLoop = PR_FALSE;
>   window->SetModal(PR_FALSE);
>-  if (appShellService)
>-      appShellService->TopLevelWindowIsModal(
>-                         static_cast<nsIXULWindow*>(this), PR_FALSE);
>+
>   /*   Note there's no EnableParent(PR_TRUE) here to match the PR_FALSE one
>      above. That's done in ExitModalLoop. It's important that the parent
>      be re-enabled before this window is made invisible; to do otherwise
Don't put in a blank line, the comment refers to the code above it.

Comment 4

[Jonathan Steele]

Attachment: Make it so

Comment 5

[[e-mail]]

Comment on attachment 340965 [details] [diff] [review]
Make it so

git-apply: fatal: corrupt patch at line 68

Comment 6

[[e-mail]]

Comment on attachment 340965 [details] [diff] [review]
Make it so

>-[scriptable, uuid(93a28ba2-7e22-11d9-9b6f-000a95d535fa)]
>+[scriptable, uuid(8BEA00EE-8E55-11DD-BEB3-497956D89593)]
Oh, and I prefer lower case uuids ;-)

Comment 7

[Jonathan Steele]

Attachment: Try Again, I hope it works this time

Comment 8

[[e-mail]]

Comment on attachment 341020 [details] [diff] [review]
Try Again, I hope it works this time

Sorry for not noticing it was just a trailing-newline bug, I didn't know git-apply wasn't as lenient as patch was.

Comment 9

[Jonathan Steele]

Neil, are you planning to check this in? I don't have checkin access.

Comment 10

[Reed Loden [:reed]]

http://hg.mozilla.org/mozilla-central/rev/1c768ccee990