Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-gtkembed-prompt-crash.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5516 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5516 byte(s)
-import
1 | niro | 153 | Index: embedding/browser/gtk/src/GtkPromptService.cpp |
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/GtkPromptService.cpp,v | ||
4 | retrieving revision 1.6 | ||
5 | diff -p -u -U10 -r1.6 GtkPromptService.cpp | ||
6 | --- embedding/browser/gtk/src/GtkPromptService.cpp 29 Sep 2003 06:03:48 -0000 1.6 | ||
7 | +++ embedding/browser/gtk/src/GtkPromptService.cpp 26 Oct 2004 14:02:19 -0000 | ||
8 | @@ -68,20 +68,22 @@ GtkPromptService::Alert(nsIDOMWindow* aP | ||
9 | prompter.Run(); | ||
10 | return NS_OK; | ||
11 | } | ||
12 | |||
13 | NS_IMETHODIMP | ||
14 | GtkPromptService::AlertCheck(nsIDOMWindow* aParent, | ||
15 | const PRUnichar* aDialogTitle, | ||
16 | const PRUnichar* aDialogText, | ||
17 | const PRUnichar* aCheckMsg, PRBool* aCheckValue) | ||
18 | { | ||
19 | + NS_ENSURE_ARG_POINTER(aCheckValue); | ||
20 | + | ||
21 | EmbedPrompter prompter; | ||
22 | prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Alert").get()); | ||
23 | prompter.SetMessageText(aDialogText); | ||
24 | prompter.SetCheckMessage(aCheckMsg); | ||
25 | prompter.SetCheckValue(*aCheckValue); | ||
26 | prompter.Create(EmbedPrompter::TYPE_ALERT_CHECK, | ||
27 | GetGtkWindowForDOMWindow(aParent)); | ||
28 | prompter.Run(); | ||
29 | prompter.GetCheckValue(aCheckValue); | ||
30 | return NS_OK; | ||
31 | @@ -102,20 +104,22 @@ GtkPromptService::Confirm(nsIDOMWindow* | ||
32 | return NS_OK; | ||
33 | } | ||
34 | |||
35 | NS_IMETHODIMP | ||
36 | GtkPromptService::ConfirmCheck(nsIDOMWindow* aParent, | ||
37 | const PRUnichar* aDialogTitle, | ||
38 | const PRUnichar* aDialogText, | ||
39 | const PRUnichar* aCheckMsg, | ||
40 | PRBool* aCheckValue, PRBool* aConfirm) | ||
41 | { | ||
42 | + NS_ENSURE_ARG_POINTER(aCheckValue); | ||
43 | + | ||
44 | EmbedPrompter prompter; | ||
45 | prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Confirm").get()); | ||
46 | prompter.SetMessageText(aDialogText); | ||
47 | prompter.SetCheckMessage(aCheckMsg); | ||
48 | prompter.SetCheckValue(*aCheckValue); | ||
49 | prompter.Create(EmbedPrompter::TYPE_CONFIRM_CHECK, | ||
50 | GetGtkWindowForDOMWindow(aParent)); | ||
51 | prompter.Run(); | ||
52 | prompter.GetCheckValue(aCheckValue); | ||
53 | prompter.GetConfirmValue(aConfirm); | ||
54 | @@ -164,24 +168,25 @@ GtkPromptService::ConfirmEx(nsIDOMWindow | ||
55 | NS_IMETHODIMP | ||
56 | GtkPromptService::Prompt(nsIDOMWindow* aParent, const PRUnichar* aDialogTitle, | ||
57 | const PRUnichar* aDialogText, PRUnichar** aValue, | ||
58 | const PRUnichar* aCheckMsg, PRBool* aCheckValue, | ||
59 | PRBool* aConfirm) | ||
60 | { | ||
61 | EmbedPrompter prompter; | ||
62 | prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get()); | ||
63 | prompter.SetMessageText(aDialogText); | ||
64 | prompter.SetTextValue(*aValue); | ||
65 | - if (aCheckMsg) { | ||
66 | + if (aCheckMsg) | ||
67 | prompter.SetCheckMessage(aCheckMsg); | ||
68 | + if (aCheckValue) | ||
69 | prompter.SetCheckValue(*aCheckValue); | ||
70 | - } | ||
71 | + | ||
72 | prompter.Create(EmbedPrompter::TYPE_PROMPT, | ||
73 | GetGtkWindowForDOMWindow(aParent)); | ||
74 | prompter.Run(); | ||
75 | if (aCheckValue) | ||
76 | prompter.GetCheckValue(aCheckValue); | ||
77 | prompter.GetConfirmValue(aConfirm); | ||
78 | if (aConfirm) { | ||
79 | if (*aValue) | ||
80 | nsMemory::Free(*aValue); | ||
81 | prompter.GetTextValue(aValue); | ||
82 | @@ -197,24 +202,25 @@ GtkPromptService::PromptUsernameAndPassw | ||
83 | PRUnichar** aPassword, | ||
84 | const PRUnichar* aCheckMsg, | ||
85 | PRBool* aCheckValue, | ||
86 | PRBool* aConfirm) | ||
87 | { | ||
88 | EmbedPrompter prompter; | ||
89 | prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get()); | ||
90 | prompter.SetMessageText(aDialogText); | ||
91 | prompter.SetUser(*aUsername); | ||
92 | prompter.SetPassword(*aPassword); | ||
93 | - if (aCheckMsg) { | ||
94 | + if (aCheckMsg) | ||
95 | prompter.SetCheckMessage(aCheckMsg); | ||
96 | + if (aCheckValue) | ||
97 | prompter.SetCheckValue(*aCheckValue); | ||
98 | - } | ||
99 | + | ||
100 | prompter.Create(EmbedPrompter::TYPE_PROMPT_USER_PASS, | ||
101 | GetGtkWindowForDOMWindow(aParent)); | ||
102 | prompter.Run(); | ||
103 | if (aCheckValue) | ||
104 | prompter.GetCheckValue(aCheckValue); | ||
105 | prompter.GetConfirmValue(aConfirm); | ||
106 | if (*aConfirm) { | ||
107 | if (*aUsername) | ||
108 | nsMemory::Free(*aUsername); | ||
109 | prompter.GetUser(aUsername); | ||
110 | @@ -231,24 +237,25 @@ GtkPromptService::PromptPassword(nsIDOMW | ||
111 | const PRUnichar* aDialogTitle, | ||
112 | const PRUnichar* aDialogText, | ||
113 | PRUnichar** aPassword, | ||
114 | const PRUnichar* aCheckMsg, | ||
115 | PRBool* aCheckValue, PRBool* aConfirm) | ||
116 | { | ||
117 | EmbedPrompter prompter; | ||
118 | prompter.SetTitle(aDialogTitle ? aDialogTitle : NS_LITERAL_STRING("Prompt").get()); | ||
119 | prompter.SetMessageText(aDialogText); | ||
120 | prompter.SetPassword(*aPassword); | ||
121 | - if (aCheckMsg) { | ||
122 | + if (aCheckMsg) | ||
123 | prompter.SetCheckMessage(aCheckMsg); | ||
124 | + if (aCheckValue) | ||
125 | prompter.SetCheckValue(*aCheckValue); | ||
126 | - } | ||
127 | + | ||
128 | prompter.Create(EmbedPrompter::TYPE_PROMPT_PASS, | ||
129 | GetGtkWindowForDOMWindow(aParent)); | ||
130 | prompter.Run(); | ||
131 | if (aCheckValue) | ||
132 | prompter.GetCheckValue(aCheckValue); | ||
133 | prompter.GetConfirmValue(aConfirm); | ||
134 | if (*aConfirm) { | ||
135 | if (*aPassword) | ||
136 | nsMemory::Free(*aPassword); | ||
137 | prompter.GetPassword(aPassword); |