Kouhei Sutou
kous****@users*****
Thu Sep 14 00:40:06 JST 2006
Index: kazehakase/src/mozilla/GtkPromptService.cpp
diff -u kazehakase/src/mozilla/GtkPromptService.cpp:1.15 kazehakase/src/mozilla/GtkPromptService.cpp:1.16
--- kazehakase/src/mozilla/GtkPromptService.cpp:1.15 Tue Jun 28 08:34:14 2005
+++ kazehakase/src/mozilla/GtkPromptService.cpp Thu Sep 14 00:40:05 2006
@@ -57,6 +57,33 @@
#include "kz-prompt-dialog.h"
#include "MozillaPrivate.h"
+
+static void
+kz_prompt_dialog_set_check_box(KzPromptDialog *prompt,
+ const PRUnichar* aCheckMsg,
+ PRBool* aCheckValue)
+{
+ if (!aCheckMsg || !aCheckValue) return;
+
+ nsEmbedCString cCheckMsg;
+ NS_UTF16ToCString(nsEmbedString(aCheckMsg),
+ NS_CSTRING_ENCODING_UTF8, cCheckMsg);
+
+ kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
+ kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
+}
+
+static void
+kz_prompt_dialog_get_check_box_value(KzPromptDialog *prompt,
+ PRBool* aCheckValue)
+{
+ if (!aCheckValue) return;
+
+ *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+}
+
+
+
GtkPromptService::GtkPromptService()
{
}
@@ -65,6 +92,7 @@
{
}
+
NS_IMPL_ISUPPORTS1(GtkPromptService, nsIPromptService)
NS_IMETHODIMP
@@ -116,13 +144,11 @@
const PRUnichar* aDialogText,
const PRUnichar* aCheckMsg, PRBool* aCheckValue)
{
- nsEmbedCString cText, cTitle, cCheckMsg;
+ nsEmbedCString cText, cTitle;
NS_UTF16ToCString(nsEmbedString(aDialogText),
NS_CSTRING_ENCODING_UTF8, cText);
NS_UTF16ToCString(nsEmbedString(aDialogTitle),
NS_CSTRING_ENCODING_UTF8, cTitle);
- NS_UTF16ToCString(nsEmbedString(aCheckMsg),
- NS_CSTRING_ENCODING_UTF8, cCheckMsg);
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_ALERT_CHECK,
@@ -134,10 +160,9 @@
kz_prompt_dialog_set_title(prompt,
aDialogTitle ? cTitle.get() : _("Alert"));
kz_prompt_dialog_set_message_text(prompt, cText.get());
- kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
- kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
+ kz_prompt_dialog_set_check_box(prompt, aCheckMsg, aCheckValue);
kz_prompt_dialog_run(prompt);
- *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+ kz_prompt_dialog_get_check_box_value(prompt, aCheckValue);
gtk_widget_destroy(GTK_WIDGET(prompt));
return NS_OK;
}
@@ -175,13 +200,11 @@
const PRUnichar* aCheckMsg,
PRBool* aCheckValue, PRBool* aConfirm)
{
- nsEmbedCString cText, cTitle, cCheckMsg;
+ nsEmbedCString cText, cTitle;
NS_UTF16ToCString(nsEmbedString(aDialogText),
NS_CSTRING_ENCODING_UTF8, cText);
NS_UTF16ToCString(nsEmbedString(aDialogTitle),
NS_CSTRING_ENCODING_UTF8, cTitle);
- NS_UTF16ToCString(nsEmbedString(aCheckMsg),
- NS_CSTRING_ENCODING_UTF8, cCheckMsg);
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_CONFIRM_CHECK,
@@ -193,10 +216,9 @@
kz_prompt_dialog_set_title(prompt,
aDialogTitle ? cTitle.get() : _("Confirm"));
kz_prompt_dialog_set_message_text(prompt, cText.get());
- kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
- kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
+ kz_prompt_dialog_set_check_box(prompt, aCheckMsg, aCheckValue);
kz_prompt_dialog_run(prompt);
- *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+ kz_prompt_dialog_get_check_box_value(prompt, aCheckValue);
*aConfirm = kz_prompt_dialog_get_confirm_value(prompt);
gtk_widget_destroy(GTK_WIDGET(prompt));
return NS_OK;
@@ -217,13 +239,11 @@
gchar *button1 = g_strdup(GetButtonLabel(aButtonFlags, BUTTON_POS_1, aButton1Title));
gchar *button2 = g_strdup(GetButtonLabel(aButtonFlags, BUTTON_POS_2, aButton2Title));
- nsEmbedCString cText, cTitle, cCheckMsg;
+ nsEmbedCString cText, cTitle;
NS_UTF16ToCString(nsEmbedString(aDialogText),
NS_CSTRING_ENCODING_UTF8, cText);
NS_UTF16ToCString(nsEmbedString(aDialogTitle),
NS_CSTRING_ENCODING_UTF8, cTitle);
- NS_UTF16ToCString(nsEmbedString(aCheckMsg),
- NS_CSTRING_ENCODING_UTF8, cCheckMsg);
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_UNIVERSAL,
@@ -235,10 +255,7 @@
kz_prompt_dialog_set_title(prompt,
aDialogTitle ? cTitle.get() : _("Confirm"));
kz_prompt_dialog_set_message_text(prompt, cText.get());
- if (aCheckMsg)
- kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
- if (aCheckValue)
- kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
+ kz_prompt_dialog_set_check_box(prompt, aCheckMsg, aCheckValue);
kz_prompt_dialog_set_buttons(prompt, button0, button1, button2);
@@ -250,8 +267,7 @@
g_free(button2);
kz_prompt_dialog_run(prompt);
- if (aCheckValue)
- *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+ kz_prompt_dialog_get_check_box_value(prompt, aCheckValue);
*aRetVal = kz_prompt_dialog_get_button_pressed(prompt);
gtk_widget_destroy(GTK_WIDGET(prompt));
return NS_OK;
@@ -264,13 +280,11 @@
PRBool* aConfirm)
{
- nsEmbedCString cText, cTitle, cCheckMsg, cTextValue;
+ nsEmbedCString cText, cTitle, cTextValue;
NS_UTF16ToCString(nsEmbedString(aDialogText),
NS_CSTRING_ENCODING_UTF8, cText);
NS_UTF16ToCString(nsEmbedString(aDialogTitle),
NS_CSTRING_ENCODING_UTF8, cTitle);
- NS_UTF16ToCString(nsEmbedString(aCheckMsg),
- NS_CSTRING_ENCODING_UTF8, cCheckMsg);
NS_UTF16ToCString(nsEmbedString(*aValue),
NS_CSTRING_ENCODING_UTF8, cTextValue);
@@ -285,15 +299,9 @@
aDialogTitle ? cTitle.get() : _("Prompt"));
kz_prompt_dialog_set_message_text(prompt, cText.get());
kz_prompt_dialog_set_text_value(prompt, cTextValue.get());
- if (aCheckMsg)
- {
- kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
- if (aCheckValue)
- kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
- }
+ kz_prompt_dialog_set_check_box(prompt, aCheckMsg, aCheckValue);
kz_prompt_dialog_run(prompt);
- if (aCheckValue)
- *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+ kz_prompt_dialog_get_check_box_value(prompt, aCheckValue);
*aConfirm = kz_prompt_dialog_get_confirm_value(prompt);
if (aConfirm)
{
@@ -320,13 +328,11 @@
PRBool* aCheckValue,
PRBool* aConfirm)
{
- nsEmbedCString cText, cTitle, cCheckMsg, cPass, cUser;
+ nsEmbedCString cText, cTitle, cPass, cUser;
NS_UTF16ToCString(nsEmbedString(aDialogText),
NS_CSTRING_ENCODING_UTF8, cText);
NS_UTF16ToCString(nsEmbedString(aDialogTitle),
NS_CSTRING_ENCODING_UTF8, cTitle);
- NS_UTF16ToCString(nsEmbedString(aCheckMsg),
- NS_CSTRING_ENCODING_UTF8, cCheckMsg);
NS_UTF16ToCString(nsEmbedString(*aUsername),
NS_CSTRING_ENCODING_UTF8, cUser);
NS_UTF16ToCString(nsEmbedString(*aPassword),
@@ -344,14 +350,9 @@
kz_prompt_dialog_set_message_text(prompt, cText.get());
kz_prompt_dialog_set_user(prompt, cUser.get());
kz_prompt_dialog_set_password(prompt, cPass.get());
- if (aCheckMsg)
- {
- kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
- kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
- }
+ kz_prompt_dialog_set_check_box(prompt, aCheckMsg, aCheckValue);
kz_prompt_dialog_run(prompt);
- if (aCheckValue)
- *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+ kz_prompt_dialog_get_check_box_value(prompt, aCheckValue);
*aConfirm = kz_prompt_dialog_get_confirm_value(prompt);
if (aConfirm)
{
@@ -382,13 +383,11 @@
const PRUnichar* aCheckMsg,
PRBool* aCheckValue, PRBool* aConfirm)
{
- nsEmbedCString cText, cTitle, cCheckMsg, cPass;
+ nsEmbedCString cText, cTitle, cPass;
NS_UTF16ToCString(nsEmbedString(aDialogText),
NS_CSTRING_ENCODING_UTF8, cText);
NS_UTF16ToCString(nsEmbedString(aDialogTitle),
NS_CSTRING_ENCODING_UTF8, cTitle);
- NS_UTF16ToCString(nsEmbedString(aCheckMsg),
- NS_CSTRING_ENCODING_UTF8, cCheckMsg);
NS_UTF16ToCString(nsEmbedString(*aPassword),
NS_CSTRING_ENCODING_UTF8, cPass);
@@ -403,14 +402,9 @@
aDialogTitle ? cTitle.get() : _("Prompt"));
kz_prompt_dialog_set_message_text(prompt, cText.get());
kz_prompt_dialog_set_password(prompt, cPass.get());
- if (aCheckMsg)
- {
- kz_prompt_dialog_set_check_message(prompt, cCheckMsg.get());
- kz_prompt_dialog_set_check_value(prompt, *aCheckValue);
- }
+ kz_prompt_dialog_set_check_box(prompt, aCheckMsg, aCheckValue);
kz_prompt_dialog_run(prompt);
- if (aCheckValue)
- *aCheckValue = kz_prompt_dialog_get_check_value(prompt);
+ kz_prompt_dialog_get_check_box_value(prompt, aCheckValue);
*aConfirm = kz_prompt_dialog_get_confirm_value(prompt);
if (aConfirm)
{