diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-06-04 02:51:32 +0800 |
| commit | b774b547788b74884b9eb690c548a6016e714023 (patch) | |
| tree | 72b9df09c0fc257169b3e9b9cbdc349e56a63101 /embed/mozilla/MozRegisterComponents.cpp | |
| parent | b699b40d663955560655271f7645ae277e6076c8 (diff) | |
| download | gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.gz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.bz2 gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.lz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.xz gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.tar.zst gsoc2013-epiphany-b774b547788b74884b9eb690c548a6016e714023.zip | |
merge mozilla-embed-strings branch
Diffstat (limited to 'embed/mozilla/MozRegisterComponents.cpp')
| -rw-r--r-- | embed/mozilla/MozRegisterComponents.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp index a99f15b10..c3247e58a 100644 --- a/embed/mozilla/MozRegisterComponents.cpp +++ b/embed/mozilla/MozRegisterComponents.cpp @@ -37,9 +37,8 @@ #include "GtkNSSKeyPairDialogs.h" #endif -#if MOZILLA_SNAPSHOT > 13 +#include <nsMemory.h> #include <nsDocShellCID.h> -#endif #include <nsIGenericFactory.h> #include <nsIComponentRegistrar.h> #include <nsICategoryManager.h> @@ -72,11 +71,12 @@ RegisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath, do_GetService(NS_CATEGORYMANAGER_CONTRACTID); NS_ENSURE_TRUE (cm, NS_ERROR_FAILURE); - nsXPIDLCString oldval; + char *oldval; return cm->AddCategoryEntry("content-policy", EPHY_CONTENT_POLICY_CONTRACTID, EPHY_CONTENT_POLICY_CONTRACTID, - PR_TRUE, PR_TRUE, getter_Copies (oldval)); + PR_TRUE, PR_TRUE, &oldval); + nsMemory::Free (oldval); } static const nsModuleComponentInfo sAppComps[] = { @@ -127,11 +127,7 @@ static const nsModuleComponentInfo sAppComps[] = { { EPHY_GLOBALHISTORY_CLASSNAME, EPHY_GLOBALHISTORY_CID, -#if MOZILLA_SNAPSHOT > 13 NS_GLOBALHISTORY2_CONTRACTID, -#else - NS_GLOBALHISTORY_CONTRACTID, -#endif MozGlobalHistoryConstructor }, { |