aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-11-15 01:11:16 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-11-15 01:11:16 +0800
commitfa2e94db1e8ec3bd0cb8be19b29ece77c66452bf (patch)
tree3ddbeeaf56fa62e472d4e619b736a2e926cfab89 /data
parentb086814a1ff6d94b29ae2185aebb22321da7e1a4 (diff)
downloadgsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar
gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar.gz
gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar.bz2
gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar.lz
gsoc2013-epiphany-fa2e94db1e8ec3bd0cb8be19b29ece77c66452bf.tar.xz
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')
-rw-r--r--data/GNOME_Epiphany_Automation.server.in2
-rw-r--r--data/GNOME_Epiphany_NautilusView.server.in10
-rw-r--r--data/ui/Makefile.am9
-rw-r--r--data/ui/nautilus-epiphany-view.xml (renamed from data/ui/nautilus-epiphany-view.xml.in)0
4 files changed, 4 insertions, 17 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>
diff --git a/data/GNOME_Epiphany_NautilusView.server.in b/data/GNOME_Epiphany_NautilusView.server.in
index 43754b711..15ab31674 100644
--- a/data/GNOME_Epiphany_NautilusView.server.in
+++ b/data/GNOME_Epiphany_NautilusView.server.in
@@ -1,14 +1,6 @@
<oaf_info>
-<oaf_server iid="OAFIID:GNOME_Epiphany_NautilusViewFactory" type="exe" location="epiphany --nautilus-view">
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:GNOME/ObjectFactory:1.0"/>
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Epiphany Nautilus view factory"/>
- <oaf_attribute name="description" type="string" _value="Epiphany content view component's factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Epiphany_NautilusView" type="factory" location="OAFIID:GNOME_Epiphany_NautilusViewFactory">
+<oaf_server iid="OAFIID:GNOME_Epiphany_NautilusView" type="factory" location="OAFIID:GNOME_Epiphany_Automation_Factory">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 355b6cef9..ea2da5f20 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,6 +1,5 @@
uixmldir = $(pkgdatadir)
-uixml_in_files = nautilus-epiphany-view.xml.in
-uixml_DATA = $(uixml_in_files:.xml.in=.xml)
+uixml_DATA = nautilus-epiphany-view.xml
xmldir = $(pkgdatadir)
xml_DATA = \
@@ -10,8 +9,4 @@ xml_DATA = \
epiphany-toolbar.xml \
epiphany-history-window-ui.xml
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST = $(uixml_in_files) $(xml_DATA)
-
-CLEANFILES = $(uixml_DATA)
+EXTRA_DIST = $(uixml_DATA) $(xml_DATA)
diff --git a/data/ui/nautilus-epiphany-view.xml.in b/data/ui/nautilus-epiphany-view.xml
index 4858abd3f..4858abd3f 100644
--- a/data/ui/nautilus-epiphany-view.xml.in
+++ b/data/ui/nautilus-epiphany-view.xml