diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-07-04 22:15:49 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-07-04 22:15:49 +0800 |
| commit | 0774d40cedbde3a4c8751d02e237f7b3b0e25572 (patch) | |
| tree | d551ee3ee49b76db5ab2b1369bdcece3f1ee0a0e /embed/ephy-embed-shell.c | |
| parent | 53e29e3ec1e3d6f72118873a221cdf2bc621091b (diff) | |
| download | gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.gz gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.bz2 gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.lz gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.xz gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.tar.zst gsoc2013-epiphany-0774d40cedbde3a4c8751d02e237f7b3b0e25572.zip | |
Remove use of acconfig.h.
2003-07-04 Marco Pesenti Gritti <marco@it.gnome.org>
* configure.in:
Remove use of acconfig.h.
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_embed_single):
* embed/ephy-embed-single.c:
* embed/ephy-embed-single.h:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/EphyWrapper.cpp:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozRegisterComponents.cpp:
* embed/mozilla/MozRegisterComponents.h:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed-single.h:
* src/bookmarks/ephy-bookmarks-import.c: (bookmark_add),
(xbel_parse_folder), (ephy_bookmarks_import_mozilla):
* src/ephy-shell.c: (ephy_shell_init):
Show an alert when mozilla cant start instead of crashing.
Do not import bookmarks dups.
Cleanup some mozilla code headers inclusion.
Diffstat (limited to 'embed/ephy-embed-shell.c')
| -rw-r--r-- | embed/ephy-embed-shell.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index e23bc79bc..61e8096a7 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -196,9 +196,24 @@ ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell) EphyEmbedSingle * ephy_embed_shell_get_embed_single (EphyEmbedShell *shell) { + if (!shell->priv->embed_single) { - shell->priv->embed_single = ephy_embed_single_new ("mozilla"); + EphyEmbedSingle *single; + gboolean res; + + single = mozilla_embed_single_new (); + res = mozilla_embed_single_init_services + (MOZILLA_EMBED_SINGLE (single)); + + if (res) + { + shell->priv->embed_single = single; + } + else + { + g_object_unref (single); + } } return shell->priv->embed_single; |