diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-05-05 20:55:11 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-05-05 20:55:11 +0800 |
| commit | 39d6c68acf69f08e5d141b6a2fc91c003a5f594c (patch) | |
| tree | 8bcbfd7655e180adb459d02c651605a19810f626 /embed/mozilla/MozRegisterComponents.cpp | |
| parent | 7e6e562f008531e7197bf71c4526d4d49f040766 (diff) | |
| download | gsoc2013-epiphany-39d6c68acf69f08e5d141b6a2fc91c003a5f594c.tar.gz gsoc2013-epiphany-39d6c68acf69f08e5d141b6a2fc91c003a5f594c.tar.zst gsoc2013-epiphany-39d6c68acf69f08e5d141b6a2fc91c003a5f594c.zip | |
Thanks to the fastback patch, we can now get the secure browser UI object
2005-05-05 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/MozRegisterComponents.cpp:
Thanks to the fastback patch, we can now get the secure browser UI
object from the docshell.
Diffstat (limited to 'embed/mozilla/MozRegisterComponents.cpp')
| -rw-r--r-- | embed/mozilla/MozRegisterComponents.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp index 4a8f8243f..d6f83da95 100644 --- a/embed/mozilla/MozRegisterComponents.cpp +++ b/embed/mozilla/MozRegisterComponents.cpp @@ -199,7 +199,7 @@ static const nsModuleComponentInfo sAppComps[] = { }, }; -#ifdef HAVE_MOZILLA_PSM +#if defined(HAVE_MOZILLA_PSM) && !defined(HAVE_GECKO_1_8) /* 5999dfd3-571f-4fcf-964b-386879f5cded */ #define NEW_CID { 0x5999dfd3, 0x571f, 0x4fcf, { 0x96, 0x4b, 0x38, 0x68, 0x79, 0xf5, 0xcd, 0xed } } @@ -234,7 +234,7 @@ reregister_secure_browser_ui (nsIComponentManager *cm, return rv; } -#endif /* HAVE_MOZILLA_PSM */ +#endif /* defined(HAVE_MOZILLA_PSM) && !defined(HAVE_GECKO_1_8) */ gboolean mozilla_register_components (void) @@ -286,14 +286,14 @@ mozilla_register_components (void) } } -#ifdef HAVE_MOZILLA_PSM +#if defined(HAVE_MOZILLA_PSM) && !defined(HAVE_GECKO_1_8) /* Workaround for http://bugzilla.gnome.org/show_bug.cgi?id=164670 */ rv = reregister_secure_browser_ui (cm, cr); if (NS_FAILED (rv)) { g_warning ("Failed to divert the nsISecureBrowserUI implementation!\n"); } -#endif /* HAVE_MOZILLA_PSM */ +#endif /* defined(HAVE_MOZILLA_PSM) && !defined(HAVE_GECKO_1_8) */ return ret; } |