671572 - Switch suite to use Services.prompt

Status: RESOLVED FIXED

(SeaMonkey :: General, defect)

Description

[Ian Neal]

Attachment: switch suite to use Services.prompt

We import Services.jsm but we need to make better use of prompt provided by it.
This patch:
* Switches suite code to use prompt provided by Services.jsm

Comment 1

[[e-mail]]

Comment on attachment 545929 [details] [diff] [review]
switch suite to use Services.prompt

>     nsPreferences.setUnicharPref("browser.startup.homepage", aURL);
[You haven't done Services.prefs yet, have you?]

>diff --git a/suite/common/downloads/downloadmanager.js b/suite/common/downloads/downloadmanager.js
This is used by the progress dialog which doesn't import Services yet...

>   setWallpaper: function() {
[I keep forgetting to write a proper wallpaper dialog...]

Comment 2

[Philip Chee]

> [I keep forgetting to write a proper wallpaper dialog...]
We can just copy the Firefox version:
http://mxr.mozilla.org/seamonkey/source/browser/base/content/nsContextMenu.js#787
http://mxr.mozilla.org/seamonkey/source/browser/components/shell/content/setDesktopBackground.xul

Comment 3

[[e-mail]]

Comment on attachment 545929 [details] [diff] [review]
switch suite to use Services.prompt

>+  if (Services.prompt.confirmEx(window, promptTitle, promptMsg,
>+      (Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) +
>+      (Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1),
>+      okButton, null, null, null, {value:0}) == 0)
Not really the right indentation here, but you don't really have much choice, so I'd just go for an extra two spaces.

>     nsPreferences.setUnicharPref("browser.startup.homepage", aURL);
>-  }
Looks like it's missing some reindentation, although in this case you might be changing the line again shortly anyway...

>-    if (!prompts.confirm(null,
>+    if (!Services.prompt.confirm(null,
>                          PlacesUIUtils.getString("bookmarksRestoreAlertTitle"),
>                          PlacesUIUtils.getString("bookmarksRestoreAlert")))
Nit: reindentation

>-                                                promptConfirmButton, null, null, null, {value:0});
>+                                   promptConfirmButton, null, null, null, {value:0}) != 0)
[I'm not actually sure that {value:0} is correct. Isn't it inout boolean?]

Comment 4

[Ian Neal]

Attachment: switch suite to use Services.prompt with more space and less zeros [Checked in: Comment 6]

Changes since last version:
* Used false instead of zero for calls to confirmEx
* Fixed indentation issues.

Comment 5

[[e-mail]]

Comment on attachment 546149 [details] [diff] [review]
switch suite to use Services.prompt with more space and less zeros [Checked in: Comment 6]

>     nsPreferences.setUnicharPref("browser.startup.homepage", aURL);
>-  }
> }
I hope this gets reindented eventually ;-)

Comment 6

[Ian Neal]

Comment on attachment 546149 [details] [diff] [review]
switch suite to use Services.prompt with more space and less zeros [Checked in: Comment 6]

http://hg.mozilla.org/comm-central/rev/a87f3182f6f9