aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-03-04 19:42:28 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-03-04 19:42:28 +0800
commit0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb (patch)
tree29233fdea4c356af916664bf0b779907e20bf9fc /embed/mozilla
parentc615a211b12f14649045651af653d251dd46a29b (diff)
downloadgsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.gz
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.bz2
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.lz
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.xz
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.zst
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.zip
about:options and about:epiphany
2003-03-04 Marco Pesenti Gritti <marco@it.gnome.org> * data/Makefile.am: * embed/mozilla/Makefile.am: * embed/mozilla/MozRegisterComponents.cpp: * src/Makefile.am: about:options and about:epiphany * src/ephy-shell.c: (ephy_init_services): monitor proxy changes * src/prefs-dialog.c: (create_page), (prefs_dialog_get_page): * src/ui-prefs.c: * src/ui-prefs.h: * lib/widgets/ephy-spinner.c: (ephy_spinner_get_theme_info), (ephy_spinner_init_directory_list), (ephy_spinner_info_free), (ephy_spinner_get_theme_path): * lib/widgets/ephy-spinner.h: Remove spinner configuration, this should be part of the icon theme at some point.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/Makefile.am3
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp16
2 files changed, 18 insertions, 1 deletions
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 34db7859e..c59edc29c 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -43,7 +43,6 @@ INCLUDES = \
-I$(MOZILLA_INCLUDE_ROOT)/typeaheadfind \
$(GCONF_CFLAGS) \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
- -DLIB_DIR=\"$(pkglibdir)\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@@ -61,6 +60,8 @@ libephymozillaembed_la_SOURCES = \
BaseProtocolContentHandler.h \
ContentHandler.cpp \
ContentHandler.h \
+ EphyAboutRedirector.cpp \
+ EphyAboutRedirector.h \
EphyEventListener.cpp \
EphyEventListener.h \
EphyWrapper.cpp \
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index a8950fc70..8534738ec 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -20,6 +20,7 @@
#include <config.h>
#endif
+#include "EphyAboutRedirector.h"
#include "StartHereProtocolHandler.h"
#include "ContentHandler.h"
#include "ExternalProtocolService.h"
@@ -41,6 +42,7 @@ static NS_DEFINE_CID(kContentHandlerCID, G_CONTENTHANDLER_CID);
static NS_DEFINE_CID(kProtocolServiceCID, G_EXTERNALPROTOCOLSERVICE_CID);
static NS_DEFINE_CID(kFilePickerCID, G_FILEPICKER_CID);
static NS_DEFINE_CID(kStartHereProcotolHandlerCID, G_START_HERE_PROTOCOLHANDLER_CID);
+static NS_DEFINE_CID(kEphyAboutRedirectorCID, EPHY_ABOUT_REDIRECTOR_CID);
static NS_DEFINE_CID(knsFtpProtocolHandlerCID, NS_FTPPROTOCOLHANDLER_CID);
static NS_DEFINE_CID(kFtpHandlerCID, G_FTP_PROTOCOL_CID);
static NS_DEFINE_CID(kIRCHandlerCID, G_IRC_PROTOCOL_CID);
@@ -95,6 +97,20 @@ mozilla_register_components (void)
PR_TRUE);
if (NS_FAILED(rv)) ret = FALSE;
+ rv = RegisterFactory (NS_NewEphyAboutRedirectorFactory,
+ kEphyAboutRedirectorCID,
+ EPHY_ABOUT_REDIRECTOR_CLASSNAME,
+ EPHY_ABOUT_REDIRECTOR_OPTIONS_CONTRACTID,
+ PR_TRUE);
+ if (NS_FAILED(rv)) ret = FALSE;
+
+ rv = RegisterFactory (NS_NewEphyAboutRedirectorFactory,
+ kEphyAboutRedirectorCID,
+ EPHY_ABOUT_REDIRECTOR_CLASSNAME,
+ EPHY_ABOUT_REDIRECTOR_EPIPHANY_CONTRACTID,
+ PR_TRUE);
+ if (NS_FAILED(rv)) ret = FALSE;
+
rv = RegisterFactory (NS_NewFtpHandlerFactory, kFtpHandlerCID,
G_FTP_CONTENT_CLASSNAME, G_FTP_CONTENT_CONTRACTID,
PR_TRUE);