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 /src/ephy-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 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 926527193..0d9fac6f3 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -170,13 +170,31 @@ ephy_shell_init (EphyShell *gs) /* This ensures mozilla is fired up */ single = ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (gs)); + if (single != NULL) + { + g_signal_connect (G_OBJECT (single), + "new_window_orphan", + G_CALLBACK(ephy_shell_new_window_cb), + NULL); - g_signal_connect (G_OBJECT (single), - "new_window_orphan", - G_CALLBACK(ephy_shell_new_window_cb), - NULL); - - ephy_init_services (gs); + ephy_init_services (gs); + } + else + { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new + (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + _("Epiphany can't be used now. " + "Mozilla initialization failed. Check your " + "MOZILLA_FIVE_HOME environmental variable.")); + gtk_dialog_run (GTK_DIALOG (dialog)); + + exit (0); + } } static void |