You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
201 lines
6.4 KiB
201 lines
6.4 KiB
diff -ur gluezilla-2.6.orig/configure.ac gluezilla-2.6/configure.ac
|
|
--- gluezilla-2.6.orig/configure.ac 2011-03-27 18:51:37.000000000 +0200
|
|
+++ gluezilla-2.6/configure.ac 2011-03-27 18:52:45.000000000 +0200
|
|
@@ -87,16 +87,23 @@
|
|
|
|
if test "x${oldxul}" != xyes ; then
|
|
|
|
- AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
|
|
- mozilla_xpcom_pcs="libxul-embedding-unstable"
|
|
- for pc in $mozilla_xpcom_pcs; do
|
|
- if $PKG_CONFIG --exists $pc; then
|
|
- AC_MSG_RESULT($pc)
|
|
- mozilla_xpcom=$pc
|
|
- XUL_VERSION=3
|
|
- break;
|
|
- fi
|
|
- done
|
|
+ if test -z $mozilla_xpcom; then
|
|
+ AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
|
|
+ mozilla_xpcom_pcs="libxul-embedding libxul-embedding-unstable"
|
|
+ for pc in $mozilla_xpcom_pcs; do
|
|
+ if $PKG_CONFIG --exists $pc; then
|
|
+ mozilla_xpcom=$pc
|
|
+ XUL_VERSION=3
|
|
+ version="$(pkg-config --modversion $pc)"
|
|
+ minor=`echo "$version" | sed -e 's,\([[0-9]]*\)\..*,\1,'`
|
|
+ if test $minor -ge 2; then
|
|
+ XUL_VERSION=4
|
|
+ fi
|
|
+ AC_MSG_RESULT(Found $version)
|
|
+ break;
|
|
+ fi
|
|
+ done
|
|
+ fi
|
|
fi
|
|
|
|
if test -z $mozilla_xpcom; then
|
|
@@ -121,10 +128,13 @@
|
|
XPCOM_PKGS="$mozilla_xpcom"
|
|
fi
|
|
|
|
-AM_CONDITIONAL([OLDXUL], [test x$XUL_VERSION = x2])
|
|
-
|
|
AC_SUBST(XUL_VERSION)
|
|
|
|
+AM_CONDITIONAL([XUL_4], [test x$XUL_VERSION = x4])
|
|
+AM_CONDITIONAL([XUL_3], [test x$XUL_VERSION = x3])
|
|
+AM_CONDITIONAL([XUL_2], [test x$XUL_VERSION = x2])
|
|
+
|
|
+
|
|
AC_ARG_ENABLE([optimize],
|
|
AC_HELP_STRING([--enable-optimize], [Enable optimizations (-O2)]),
|
|
[
|
|
Sólo en gluezilla-2.6: configure.ac.orig
|
|
Sólo en gluezilla-2.6: configure.ac.rej
|
|
diff -ur gluezilla-2.6.orig/src/BrowserWindow.cpp gluezilla-2.6/src/BrowserWindow.cpp
|
|
--- gluezilla-2.6.orig/src/BrowserWindow.cpp 2011-03-27 18:51:37.000000000 +0200
|
|
+++ gluezilla-2.6/src/BrowserWindow.cpp 2011-03-27 18:51:46.000000000 +0200
|
|
@@ -28,23 +28,6 @@
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(SecurityWarningDialogs)
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(PromptService)
|
|
|
|
-static const nsModuleComponentInfo components[] = {
|
|
- {
|
|
- SECURITYWARNINGSDIALOGS_CLASSNAME,
|
|
- SECURITYWARNINGSDIALOGS_CID,
|
|
- NS_SECURITYWARNINGDIALOGS_CONTRACTID,
|
|
- SecurityWarningDialogsConstructor
|
|
- },
|
|
- {
|
|
- PROMPTSERVICE_CLASSNAME,
|
|
- PROMPTSERVICE_CID,
|
|
- NS_PROMPTSERVICE_CONTRACTID,
|
|
- PromptServiceConstructor
|
|
- }
|
|
-
|
|
-};
|
|
-
|
|
-
|
|
BrowserWindow::BrowserWindow (void)
|
|
{
|
|
owner = nsnull;
|
|
@@ -162,17 +145,17 @@
|
|
nsCOMPtr<nsIFactory> componentFactory;
|
|
rv = NS_NewSecurityWarningServiceFactory(getter_AddRefs(componentFactory));
|
|
if (NS_SUCCEEDED(rv)) {
|
|
- compReg->RegisterFactory(components[0].mCID,
|
|
- components[0].mDescription,
|
|
- components[0].mContractID,
|
|
+ compReg->RegisterFactory(kSECURITYWARNINGSDIALOGS_CID,
|
|
+ SECURITYWARNINGSDIALOGS_CLASSNAME,
|
|
+ NS_SECURITYWARNINGDIALOGS_CONTRACTID,
|
|
componentFactory);
|
|
}
|
|
|
|
rv = NS_NewPromptServiceFactory(getter_AddRefs(componentFactory), this);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
- compReg->RegisterFactory(components[1].mCID,
|
|
- components[1].mDescription,
|
|
- components[1].mContractID,
|
|
+ compReg->RegisterFactory(kPROMPTSERVICE_CID,
|
|
+ PROMPTSERVICE_CLASSNAME,
|
|
+ NS_PROMPTSERVICE_CONTRACTID,
|
|
componentFactory);
|
|
}
|
|
|
|
diff -ur gluezilla-2.6.orig/src/Makefile.am gluezilla-2.6/src/Makefile.am
|
|
--- gluezilla-2.6.orig/src/Makefile.am 2011-03-27 18:51:37.000000000 +0200
|
|
+++ gluezilla-2.6/src/Makefile.am 2011-03-27 18:51:46.000000000 +0200
|
|
@@ -26,7 +26,7 @@
|
|
gluezilla.h \
|
|
FastDelegate.h
|
|
|
|
-if OLDXUL
|
|
+if XUL_2
|
|
libgluezilla_la_SOURCES += \
|
|
gluezilla_nsIScriptContext.h \
|
|
gluezilla_nsIScriptGlobalObject.h
|
|
diff -ur gluezilla-2.6.orig/src/PromptService.h gluezilla-2.6/src/PromptService.h
|
|
--- gluezilla-2.6.orig/src/PromptService.h 2011-03-27 18:51:37.000000000 +0200
|
|
+++ gluezilla-2.6/src/PromptService.h 2011-03-27 18:51:46.000000000 +0200
|
|
@@ -20,8 +20,9 @@
|
|
// {77686174-2061-6d20-6920-746F20646F20}
|
|
#define PROMPTSERVICE_CID \
|
|
{ 0x77686174, 0x2061, 0x6d20, { 0x69, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x6F, 0x20 } }
|
|
-
|
|
-
|
|
+
|
|
+static NS_DEFINE_CID(kPROMPTSERVICE_CID, PROMPTSERVICE_CID);
|
|
+
|
|
class PromptService : public nsIPromptService
|
|
{
|
|
NS_DECL_ISUPPORTS
|
|
diff -ur gluezilla-2.6.orig/src/SecurityWarningsDialogs.h gluezilla-2.6/src/SecurityWarningsDialogs.h
|
|
--- gluezilla-2.6.orig/src/SecurityWarningsDialogs.h 2011-03-27 18:51:37.000000000 +0200
|
|
+++ gluezilla-2.6/src/SecurityWarningsDialogs.h 2011-03-27 18:51:46.000000000 +0200
|
|
@@ -21,8 +21,9 @@
|
|
// {696E7465-7265-7374-696E-67206C696665}
|
|
#define SECURITYWARNINGSDIALOGS_CID \
|
|
{ 0x696E7465, 0x7265, 0x7374, { 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x69, 0x66, 0x65 } }
|
|
-
|
|
-
|
|
+
|
|
+static NS_DEFINE_CID(kSECURITYWARNINGSDIALOGS_CID, SECURITYWARNINGSDIALOGS_CID);
|
|
+
|
|
class SecurityWarningDialogs : public nsISecurityWarningDialogs
|
|
{
|
|
public:
|
|
diff -ur gluezilla-2.6.orig/src/interfaces.h gluezilla-2.6/src/interfaces.h
|
|
--- gluezilla-2.6.orig/src/interfaces.h 2011-03-27 18:51:37.000000000 +0200
|
|
+++ gluezilla-2.6/src/interfaces.h 2011-03-27 18:51:46.000000000 +0200
|
|
@@ -4,7 +4,18 @@
|
|
#define TO_STRING(x) #x
|
|
|
|
//Gecko Embedding API
|
|
+#if XUL_VERSION < 4
|
|
#include <nsEmbedAPI.h>
|
|
+#else
|
|
+#include <nscore.h>
|
|
+#include <nsXPCOM.h>
|
|
+#include <nsILocalFile.h>
|
|
+#include <nsIDirectoryService.h>
|
|
+#define NS_GRE_COMPONENT_DIR "GreComsD"
|
|
+#define NS_XPCOM_COMPONENT_DIR "ComsD"
|
|
+#define NS_XPCOM_COMPONENT_REGISTRY_FILE "ComRegF"
|
|
+#define NS_XPCOM_XPTI_REGISTRY_FILE "XptiRegF"
|
|
+#endif
|
|
|
|
//XPCOM API
|
|
#include <nsCOMPtr.h>
|
|
@@ -78,8 +89,12 @@
|
|
#include <nsIPromptService.h>
|
|
#include <nsISecurityWarningDialogs.h>
|
|
#include <nsIComponentRegistrar.h>
|
|
+#if XUL_VERSION < 4
|
|
#include <nsIGenericFactory.h>
|
|
-
|
|
+#else
|
|
+#include <mozilla/ModuleUtils.h>
|
|
+struct nsModuleComponentInfo;
|
|
+#endif
|
|
// preferences
|
|
#include <nsIPrefBranch.h>
|
|
#include <nsIPrefService.h>
|
|
@@ -131,12 +146,15 @@
|
|
typedef type (NS_FROZENCALL * name##Type) params; \
|
|
extern name##Type name NS_HIDDEN;
|
|
|
|
+#if XUL_VERSION < 4
|
|
XRE_API(nsresult,
|
|
XRE_InitEmbedding, (nsILocalFile *aLibXULDirectory,
|
|
nsILocalFile *aAppDirectory,
|
|
nsIDirectoryServiceProvider *aAppDirProvider,
|
|
nsStaticModuleInfo const *aStaticComponents,
|
|
PRUint32 aStaticComponentCount))
|
|
+#endif
|
|
+
|
|
|
|
XRE_API(void, XRE_TermEmbedding, ())
|
|
|