R data/GNOME_Epiphany_Automation.server.in: A data/epiphany-service.xml: A

2006-01-02  Christian Persch  <chpe@cvs.gnome.org>

	* Makefile.am:
	* autogen.sh:
	* configure.ac:
	R data/GNOME_Epiphany_Automation.server.in:
	* data/Makefile.am:
	A data/epiphany-service.xml:
	A data/org.gnome.Epiphany.service.in:
	* doc/reference/Makefile.am:
	R idl/.cvsignore:
	R idl/EphyAutomation.idl:
	R idl/Makefile.am:
	* lib/Makefile.am:
	R lib/ephy-dbus.c:
	R lib/ephy-dbus.h:
	* lib/ephy-file-helpers.c: (ephy_file_launch_application):
	* src/Makefile.am:
	A src/ephy-activation.c:
	A src/ephy-activation.h:
	A src/ephy-dbus.c:
	A src/ephy-dbus.h:
	* src/ephy-main.c: (main):
	* src/ephy-shell.c: (ephy_shell_init), (open_urls),
	(dbus_g_proxy_finalized_cb), (ephy_shell_startup),
	(ephy_shell_dispose):

	Bonobo is dead; long live the Bonobos!
	Patch by Gustavo Gama, bug #322463.

4 files changed, 39 insertions, 24 deletions

diff --git a/data/GNOME_Epiphany_Automation.server.in b/data/GNOME_Epiphany_Automation.server.in
deleted file mode 100644
index 05b831039..000000000
--- a/data/GNOME_Epiphany_Automation.server.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Epiphany_Automation_Factory" type="exe" location="epiphany">
-  <oaf_attribute name="repo_ids" type="stringv">
-    <item value="IDL:GNOME/ObjectFactory:1.0"/>
-  </oaf_attribute>
-  <oaf_attribute name="name" type="string" value="Epiphany automation"/>        
-  <oaf_attribute name="description" type="string" value="Epiphany automation factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Epiphany_Automation" 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:GNOME/EpiphanyAutomation:1.0"/>
-  </oaf_attribute>
-  <oaf_attribute name="name" type="string" _value="Epiphany automation"/>
-  <oaf_attribute name="description" type="string" value="Epiphany automation"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/data/Makefile.am b/data/Makefile.am
index 2dfdd64ab..a5c2bcba9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,10 +25,6 @@ default-prefs.js: $(default_prefs_files)
 default_prefsdir = $(pkgdatadir)
 default_prefs_DATA = default-prefs.js
 
-server_in_files = GNOME_Epiphany_Automation.server.in
-server_DATA = GNOME_Epiphany_Automation.server
-serverdir = $(libdir)/bonobo/servers
-
 desktop_in_files = epiphany.desktop.in.in bme.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@@ -58,6 +54,16 @@ xsl_DATA = \
 	epiphany-bookmarks-html.xsl	\
 	ephy-xml2ini.xsl
 
+# Dbus service file
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.gnome.Epiphany.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+ 
+# Rule to make the service file with bindir expanded
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+
 install-data-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
 	if test -z "$(DESTDIR)" ; then \
@@ -78,6 +84,7 @@ EXTRA_DIST = \
 	     $(pkgconfig_DATA)		\
 	     $(default_prefs_in_FILES)	\
 	     $(xsl_DATA)		\
+	     $(service_DATA)		\
 	     $(m4data_DATA)		\
 	     check-mime.py		\
 	     generate-font-schemas.py
diff --git a/data/epiphany-service.xml b/data/epiphany-service.xml
new file mode 100644
index 000000000..2e21799a9
--- /dev/null
+++ b/data/epiphany-service.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/gnome/Epiphany">
+	<interface name="org.gnome.Epiphany">
+		<method name="loadSession">
+			<arg type="s"/>
+			<arg type="u"/>
+		</method>
+		<method name="loadUrl">
+			<arg type="s"/>
+			<arg type="b"/>
+			<arg type="b"/>
+			<arg type="b"/>
+			<arg type="u"/>
+		</method>
+		<method name="openBookmarksEditor">
+			<arg type="u"/>
+		</method>
+		<method name="importBookmarks">
+			<arg type="s"/>
+		</method>
+		<method name="addBookmark">
+			<arg type="s"/>
+		</method>
+	</interface>
+</node>
diff --git a/data/org.gnome.Epiphany.service.in b/data/org.gnome.Epiphany.service.in
new file mode 100644
index 000000000..003ec0c66
--- /dev/null
+++ b/data/org.gnome.Epiphany.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.Epiphany
+Exec=@bindir@/epiphany