diff options
author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-15 01:11:16 +0800 |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-15 01:11:16 +0800 |
commit | fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf (patch) | |
tree | 3ddbeeaf56fa62e472d4e619b736a2e926cfab89 /data/GNOME_Epiphany_Automation.server.in | |
parent | b086814a1ff6d94b29ae2185aebb22321da7e1a4 (diff) | |
download | gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar.gz gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar.zst gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.zip |
Use an unique factory for both interfaces.
2003-11-14 Marco Pesenti Gritti <marco@gnome.org>
* 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.
Diffstat (limited to 'data/GNOME_Epiphany_Automation.server.in')
-rw-r--r-- | data/GNOME_Epiphany_Automation.server.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_Epiphany_Automation_Factory" type="exe" location="epiphany"> +<oaf_server iid="OAFIID:GNOME_Epiphany_Automation_Factory" type="exe" location="epiphany -s"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> |