svnno****@sourc*****
svnno****@sourc*****
Sat Jan 5 15:27:17 JST 2008
Revision: 3333
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3333
Author: kous
Date: 2008-01-05 15:27:16 +0900 (Sat, 05 Jan 2008)
Log Message:
-----------
* module/embed/gecko/GtkPromptService.cpp: removed MozillaPrivate dependency.
* module/embed/gecko/GtkNSSDialog.{cpp,h}: don't build on
environment that doesn't have nsIBadCertListener.h.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp
kazehakase/trunk/module/embed/gecko/GtkPromptService.h
kazehakase/trunk/module/embed/gecko/Makefile.am
kazehakase/trunk/module/embed/gecko/mozilla.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-01-05 06:10:39 UTC (rev 3332)
+++ kazehakase/trunk/ChangeLog 2008-01-05 06:27:16 UTC (rev 3333)
@@ -1,5 +1,11 @@
2008-01-05 Kouhei Sutou <kou****@cozmi*****>
+ * module/embed/gecko/GtkPromptService.cpp: removed MozillaPrivate
+ dependency.
+
+ * module/embed/gecko/GtkNSSDialog.{cpp,h}: don't build on
+ environment that doesn't have nsIBadCertListener.h.
+
* module/embed/gecko/kz-gecko-embed.cpp: defined MOZILLA_CLIENT.
* module/embed/gecko/: split gtkmozembed related files to ...
Modified: kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp 2008-01-05 06:10:39 UTC (rev 3332)
+++ kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp 2008-01-05 06:27:16 UTC (rev 3333)
@@ -47,6 +47,7 @@
#include <nsCOMPtr.h>
#include <nsIServiceManager.h>
+#include <nsIDocument.h>
#include <nsIDOMDocument.h>
#include <nsIDOMWindow.h>
#include <nsIDOMCharacterData.h>
@@ -55,7 +56,6 @@
#include <glib/gi18n.h>
#include "kz-prompt-dialog.h"
-#include "MozillaPrivate.h"
static void
@@ -126,7 +126,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_ALERT,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -153,7 +153,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_ALERT_CHECK,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -180,7 +180,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_CONFIRM,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -209,7 +209,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_CONFIRM_CHECK,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -248,7 +248,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_UNIVERSAL,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -291,7 +291,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_PROMPT,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -341,7 +341,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_PROMPT_USER_PASS,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -394,7 +394,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_PROMPT_PASS,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -436,7 +436,7 @@
KzPromptDialog *prompt = KZ_PROMPT_DIALOG(kz_prompt_dialog_new_with_parent
(TYPE_SELECT,
GTK_WINDOW(GetGtkWindowForDOMWindow(aParent))));
- gchar *host = MozillaPrivate::GetURIForDOMWindow(aParent);
+ gchar *host = GetURIForDOMWindow(aParent);
kz_prompt_dialog_set_host (prompt, host);
if (host)
g_free(host);
@@ -492,3 +492,25 @@
}
return aLabel;
}
+
+gchar *
+GtkPromptService::GetURIForDOMWindow(nsIDOMWindow* aDOMWindow)
+{
+ if (!aDOMWindow)
+ return NULL;
+
+ nsCOMPtr<nsIDOMDocument> domDoc;
+ aDOMWindow->GetDocument(getter_AddRefs(domDoc));
+ nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
+
+ if (!doc)
+ return NULL;
+
+ nsCOMPtr<nsIURI> uri;
+ uri = doc->GetDocumentURI();
+
+ nsCAutoString str;
+ uri->GetHost(str);
+
+ return g_strdup(str.get());
+}
Modified: kazehakase/trunk/module/embed/gecko/GtkPromptService.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/GtkPromptService.h 2008-01-05 06:10:39 UTC (rev 3332)
+++ kazehakase/trunk/module/embed/gecko/GtkPromptService.h 2008-01-05 06:27:16 UTC (rev 3333)
@@ -60,5 +60,6 @@
private:
const char *GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,
const PRUnichar* aStringValue);
+ gchar *GetURIForDOMWindow(nsIDOMWindow* aDOMWindow);
};
Modified: kazehakase/trunk/module/embed/gecko/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gecko/Makefile.am 2008-01-05 06:10:39 UTC (rev 3332)
+++ kazehakase/trunk/module/embed/gecko/Makefile.am 2008-01-05 06:27:16 UTC (rev 3333)
@@ -71,7 +71,6 @@
kz-gecko-embed-module.cpp \
kz-gecko-embed.cpp kz-gecko-embed.h \
kz-gecko-single.cpp kz-gecko-single.h \
- GtkNSSDialogs.cpp GtkNSSDialogs.h \
GtkPromptService.cpp GtkPromptService.h \
mozilla.cpp mozilla.h \
mozilla-prefs.cpp mozilla-prefs.h \
@@ -86,6 +85,11 @@
kz-mozwrapper.cpp kz-mozwrapper.h \
kz-mozhistorysearch.cpp kz-mozhistorysearch.h
+if HAVE_NSIBADCERTLISTENER_H
+gecko_la_SOURCES += \
+ GtkNSSDialogs.cpp GtkNSSDialogs.h
+endif
+
gecko_la_LIBADD = \
$(MOZILLA_COMPONENT_LIBS) \
$(GTK_LIBS) \
Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-01-05 06:10:39 UTC (rev 3332)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-01-05 06:27:16 UTC (rev 3333)
@@ -43,7 +43,9 @@
#include "kazehakase.h"
#include "kz-mozhistorysearch.h"
#include "kz-mozselectionlistener.h"
-#include "GtkNSSDialogs.h"
+#ifdef HAVE_NSIBADCERTLISTNER_H
+# include "GtkNSSDialogs.h"
+#endif
#include "GtkPromptService.h"
@@ -53,7 +55,9 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(KzMozHistorySearchProtocolHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR(KzMozPrintingPromptService)
NS_GENERIC_FACTORY_CONSTRUCTOR(GtkPromptService)
+#ifdef HAVE_NSIBADCERTLISTNER_H
NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSDialogs)
+#endif
static const nsModuleComponentInfo sAppComps[] = {
{
@@ -90,6 +94,7 @@
KZ_PRINTINGPROMPTSERVICE_CONTRACTID,
KzMozPrintingPromptServiceConstructor
},
+#ifdef HAVE_NSIBADCERTLISTNER_H
{
GTK_NSSDIALOGS_CLASSNAME,
GTK_NSSDIALOGS_CID,
@@ -102,6 +107,7 @@
NS_CERTIFICATEDIALOGS_CONTRACTID,
GtkNSSDialogsConstructor
},
+#endif
{
"Prompt Service",
NS_PROMPTSERVICE_CID,