svnno****@sourc*****
svnno****@sourc*****
Wed Mar 12 10:14:26 JST 2008
Revision: 3476
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3476
Author: ikezoe
Date: 2008-03-12 10:14:25 +0900 (Wed, 12 Mar 2008)
Log Message:
-----------
* macro/gecko.m4, module/embed/gecko/mozilla.cpp,
module/embed/gecko/kz-mozlauncher.cpp,
module/embed/gecko/kz-mozwrapper.cpp,
module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp: More cleanup.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/Makefile.am
kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am
kazehakase/trunk/module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp
kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
kazehakase/trunk/module/embed/gecko/mozilla.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/ChangeLog 2008-03-12 01:14:25 UTC (rev 3476)
@@ -2,6 +2,10 @@
* macro/gecko.m4: Append some directories to MOZILLA_INCLUDE_ROOT for
xulrunner sdk.
+ * macro/gecko.m4, module/embed/gecko/mozilla.cpp,
+ module/embed/gecko/kz-mozlauncher.cpp,
+ module/embed/gecko/kz-mozwrapper.cpp,
+ module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp: More cleanup.
2008-03-11 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/module/embed/gecko/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gecko/Makefile.am 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/module/embed/gecko/Makefile.am 2008-03-12 01:14:25 UTC (rev 3476)
@@ -32,6 +32,7 @@
-I$(MOZILLA_INCLUDE_ROOT)/jsconsole \
-I$(MOZILLA_INCLUDE_ROOT)/layout \
-I$(MOZILLA_INCLUDE_ROOT)/locale \
+ -I$(MOZILLA_INCLUDE_ROOT)/loginmgr \
-I$(MOZILLA_INCLUDE_ROOT)/mimetype \
-I$(MOZILLA_INCLUDE_ROOT)/mozxfer \
-I$(MOZILLA_INCLUDE_ROOT)/necko \
@@ -46,6 +47,8 @@
-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
-I$(MOZILLA_INCLUDE_ROOT)/sidebar \
-I$(MOZILLA_INCLUDE_ROOT)/shistory \
+ -I$(MOZILLA_INCLUDE_ROOT)/string \
+ -I$(MOZILLA_INCLUDE_ROOT)/thebes \
-I$(MOZILLA_INCLUDE_ROOT)/txtsvc \
-I$(MOZILLA_INCLUDE_ROOT)/uconv \
-I$(MOZILLA_INCLUDE_ROOT)/uriloader \
@@ -57,6 +60,7 @@
-I$(MOZILLA_INCLUDE_ROOT)/widget \
-I$(MOZILLA_INCLUDE_ROOT)/windowwatcher \
-I$(MOZILLA_INCLUDE_ROOT)/xmlextras \
+ -I$(MOZILLA_INCLUDE_ROOT)/xpcom \
$(GTK_CFLAGS) \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am 2008-03-12 01:14:25 UTC (rev 3476)
@@ -49,6 +49,7 @@
-I$(MOZILLA_INCLUDE_ROOT)/xmlextras \
-I$(MOZILLA_INCLUDE_ROOT)/string \
-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
+ -I$(MOZILLA_INCLUDE_ROOT)/thebes \
$(GTK_CFLAGS) \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/nsEmbedAPI.cpp 2008-03-12 01:14:25 UTC (rev 3476)
@@ -74,16 +74,11 @@
#endif
-#ifdef MOZ_HAVE_NSINITXPCOM3_
NS_METHOD
NS_InitEmbedding(nsILocalFile *mozBinDirectory,
nsIDirectoryServiceProvider *appFileLocProvider,
nsStaticModuleInfo const *aStaticComponents,
PRUint32 aStaticComponentCount)
-#else
-nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
- nsIDirectoryServiceProvider *appFileLocProvider)
-#endif
{
nsresult rv;
@@ -99,12 +94,8 @@
#endif
{
// Initialise XPCOM
-#ifdef MOZ_HAVE_NSINITXPCOM3_
rv = NS_InitXPCOM3(&sServiceManager, mozBinDirectory, appFileLocProvider,
aStaticComponents, aStaticComponentCount);
-#else
- rv = NS_InitXPCOM2(&sServiceManager, mozBinDirectory, appFileLocProvider);
-#endif
NS_ENSURE_SUCCESS(rv, rv);
#ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
Modified: kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-03-12 01:14:25 UTC (rev 3476)
@@ -59,11 +59,7 @@
NS_IMETHODIMP KzContentHandler::Show(nsIHelperAppLauncher *aLauncher,
nsISupports *aContext,
-#ifdef MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_
- PRBool aForced)
-#else
PRUint32 aForced)
-#endif
{
nsresult rv;
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-12 01:14:25 UTC (rev 3476)
@@ -194,24 +194,11 @@
// Original copyright notice.
// Copyright (C) 2000 Marco Pesenti Gritti
-#ifdef HAVE_NSIDOCSHELL_GETSECUREUI
nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv));
NS_ENSURE_SUCCESS (rv, rv);
rv = docShell->GetSecurityUI (getter_AddRefs (mSecurityInfo));
NS_ENSURE_SUCCESS (rv, rv);
-#else
- // Workaround for http://bugzilla.gnome.org/show_bug.cgi?id=164670
- mSecurityInfo = do_CreateInstance("@kazehakase.sf.jp/hacks/secure-browser-ui;1");
- if (mSecurityInfo)
- {
- mSecurityInfo->Init (mDOMWindow);
- }
- else
- {
- g_warning ("Failed to instantiate nsISecureBrowserUI!\n");
- }
-#endif
return NS_OK;
}
Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-03-11 23:05:11 UTC (rev 3475)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-03-12 01:14:25 UTC (rev 3476)
@@ -117,41 +117,6 @@
};
static const int sNumAppComps = G_N_ELEMENTS(sAppComps);
-#ifndef HAVE_NSIDOCSHELL_GETSECUREUI
-/* bee4dc31-1326-4c08-9bda-7b230dca97e9 */
-#define NEW_CID { 0xbee4dc31, 0x1326, 0x4c08, { 0x9b, 0xda, 0x7b, 0x23, 0x0d, 0xca, 0x97, 0xe9 } }
-
-static nsresult
-reregister_secure_browser_ui (nsIComponentManager *cm, nsIComponentRegistrar *cr)
-{
- nsresult rv;
-
- /* Workaround as a result of:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=94974
- * see
- * http://bugzilla.gnome.org/show_bug.cgi?id=164670
- */
- nsCOMPtr<nsIFactory> factory;
- rv = cm->GetClassObjectByContractID ("@mozilla.org/secure_browser_ui;1",
- NS_GET_IID(nsIFactory), getter_AddRefs (factory));
- NS_ENSURE_SUCCESS (rv, rv);
-
- nsCID *cidPtr = nsnull;
- rv = cr->ContractIDToCID("@mozilla.org/secure_browser_ui;1", &cidPtr);
- NS_ENSURE_SUCCESS (rv, rv);
-
- rv = cr->UnregisterFactory (*cidPtr, factory);
- NS_ENSURE_SUCCESS (rv, rv);
-
- const nsCID new_cid = NEW_CID;
- rv = cr->RegisterFactory (new_cid, "Kazehakase Secure Browser Class",
- "@kazehakase.sf.jp/hacks/secure-browser-ui;1", factory);
- NS_ENSURE_SUCCESS (rv, rv);
-
- return NS_OK;
-}
-#endif
-
#ifdef XPCOM_GLUE
gboolean
xulrunner_init (void)
@@ -243,10 +208,6 @@
ret = FALSE;
}
-#ifndef HAVE_NSIDOCSHELL_GETSECUREUI
- // Workaround for http://bugzilla.gnome.org/show_bug.cgi?id=164670
- reregister_secure_browser_ui(cm, cr);
-#endif
return ret;
}