diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-14 01:28:04 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-14 01:28:04 +0800 |
| commit | 62caa3e6eec7b6109703071179ed260aac507db7 (patch) | |
| tree | 9ccf963ec55954e7adab7b4a68eac776d9114ca1 /src/ephy-main.c | |
| parent | 00c81d309184a49f6e711c4ce0b61ae8f94b42ae (diff) | |
| download | gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.gz gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.bz2 gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.lz gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.xz gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.zst gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.zip | |
Rework shell services initialization so that it happen either on every
2003-11-13 Marco Pesenti Gritti <marco@gnome.org>
* embed/mozilla/mozilla-notifiers.cpp:
* src/ephy-main.c: (main):
* src/ephy-shell.c: (ephy_shell_init), (ephy_shell_startup),
(ephy_shell_finalize), (ephy_shell_get_session),
(ephy_shell_get_extensions_manager):
* src/ephy-window.c: (ensure_default_icon), (ephy_window_init):
Rework shell services initialization so that it happen either
on every instance, before the automation stuff is used, either
when they are requested. This appear to fix the crash with two
instances runned simultaneously.
(Christian I'm not quite sure this is ok for plugins manager, if
there are problems let me know.)
Diffstat (limited to 'src/ephy-main.c')
| -rw-r--r-- | src/ephy-main.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index 542cc3c06..d94e301a1 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -21,6 +21,12 @@ #endif #include "ephy-shell.h" +#include "ephy-file-helpers.h" +#include "ephy-thread-helpers.h" +#include "ephy-state.h" +#include "ephy-debug.h" +#include "ephy-stock-icons.h" +#include "eel-gconf-extensions.h" #include <libgnomeui/gnome-ui-init.h> #include <gtk/gtkmain.h> @@ -28,6 +34,8 @@ #include <libgnome/gnome-program.h> #include <bonobo/bonobo-main.h> #include <glib/gi18n.h> +#include <glade/glade-init.h> +#include <libgnomevfs/gnome-vfs-init.h> static gboolean open_in_existing = FALSE; static gboolean open_in_new_tab = FALSE; @@ -143,6 +151,13 @@ main (int argc, char *argv[]) string_arg = bookmark_url; } + gnome_vfs_init (); + glade_gnome_init (); + ephy_debug_init (); + ephy_thread_helpers_init (); + ephy_file_helpers_init (); + ephy_stock_icons_init (); + eel_gconf_monitor_add ("/apps/epiphany/general"); bonobo_activate (); ephy_shell = ephy_shell_new (); @@ -167,5 +182,10 @@ main (int argc, char *argv[]) gtk_main (); } + eel_gconf_monitor_remove ("/apps/epiphany/general"); + ephy_state_save (); + ephy_file_helpers_shutdown (); + gnome_vfs_shutdown (); + return 0; } |