From fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 14 Nov 2003 17:11:16 +0000 Subject: Use an unique factory for both interfaces. 2003-11-14 Marco Pesenti Gritti * data/GNOME_Epiphany_Automation.server.in: * data/GNOME_Epiphany_NautilusView.server.in: Use an unique factory for both interfaces. * data/ui/Makefile.am: Do not try to merge translations in nautilus xml. * src/ephy-nautilus-view.c: (disconnected_idle), (control_disconnected_cb), (ephy_nautilus_view_instance_init), (ephy_nautilus_view_finalize): Unref the view on control disconnected, not on finalize. * src/ephy-main.c: (main): Add a server mode argument, used internally by bonobo interface. Free popt context only when no more necessary. * src/ephy-automation.c: * src/ephy-automation.h: * src/ephy-shell.c: (ephy_nautilus_view_new), (ephy_automation_factory_cb), (ephy_automation_factory_new), (ephy_shell_init), (path_from_command_line_arg), (open_urls), (server_timeout), (ephy_shell_startup), (ephy_shell_finalize), (ephy_shell_new_tab): * src/ephy-shell.h: When running in server mode unref (and so exit) on a timeout. Expand args passed to the command line. --- data/GNOME_Epiphany_Automation.server.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/GNOME_Epiphany_Automation.server.in') diff --git a/data/GNOME_Epiphany_Automation.server.in b/data/GNOME_Epiphany_Automation.server.in index 05b831039..ab04cb821 100644 --- a/data/GNOME_Epiphany_Automation.server.in +++ b/data/GNOME_Epiphany_Automation.server.in @@ -1,6 +1,6 @@ - + -- cgit