From 4d8b2c6114da0d8b629215a2ca690411d1d71949 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Thu, 2 Feb 2006 13:31:32 +0000
Subject: Queue commands received from the main and remote instances, and
 process

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

	* src/ephy-session.c: (save_yourself_cb), (die_cb),
	(session_command_free), (session_command_find),
	(resume_dialog_response_cb), (resume_dialog_weak_ref_cb),
	(session_command_autoresume),
	(session_command_open_bookmarks_editor),
	(session_command_open_uris), (session_command_dispatch),
	(session_command_queue_next), (session_command_queue_clear),
	(ephy_session_init), (ephy_session_dispose),
	(ephy_session_finalize), (ephy_session_close), (ephy_session_load),
	(ephy_session_get_active_window), (ephy_session_queue_command):
	* src/ephy-session.h:
	* src/ephy-main.c: (unref_proxy_reply_cb), (open_urls),
	(call_dbus_proxy), (queue_commands), (main):

	Queue commands received from the main and remote instances,
	and process them after autoresume has completed. Bug #328286.

	* data/epiphany-service.xml:
	* lib/ephy-file-helpers.c: (ephy_file_helpers_init):
	* lib/ephy-file-helpers.h:
	* src/ephy-activation.c: (session_queue_command),
	(ephy_activation_load_uri_list), (ephy_activation_load_session),
	(ephy_activation_open_bookmarks_editor):
	* src/ephy-activation.h:
	* src/ephy-dbus.c:
	* src/ephy-dbus.h:
	* src/epiphany.defs:
---
 data/epiphany-service.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'data')

diff --git a/data/epiphany-service.xml b/data/epiphany-service.xml
index 049536f27..f2a759a73 100644
--- a/data/epiphany-service.xml
+++ b/data/epiphany-service.xml
@@ -2,16 +2,17 @@
 <node name="/org/gnome/Epiphany">
 	<interface name="org.gnome.Epiphany">
 		<method name="loadSession">
-			<arg type="s"/>
-			<arg type="u"/>
+			<arg type="s" name="SessionFilename" direction="in" />
+			<arg type="u" name="Timestamp" direction="in" />
 		</method>
-		<method name="loadUris">
-			<arg type="as"/>
-			<arg type="s"/>
-			<arg type="u"/>
+		<method name="loadURIList">
+			<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="ephy_activation_load_uri_list" />
+			<arg type="as" name="URIs" direction="in" />
+			<arg type="s" name="Options" direction="in" />
+			<arg type="u" name="Timestamp" direction="in" />
 		</method>
 		<method name="openBookmarksEditor">
-			<arg type="u"/>
+			<arg type="u" name="Timestamp" direction="in" />
 		</method>
 	</interface>
 </node>
-- 
cgit v1.2.3