From 3cc751a30e83efeed8fc9707d2069c545aa005c6 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Tue, 1 Feb 2005 23:42:48 +0000
Subject: Define variants with startup ID.

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

	* idl/EphyAutomation.idl:

	Define variants with startup ID.

	* lib/ephy-gui.c: (ephy_gui_window_update_user_time):
	* lib/ephy-gui.h:
	* src/bookmarks/ephy-bookmarks.c: (redirect_cb):
	* src/ephy-automation.c:
	(impl_ephy_automation_loadUrlWithStartupId),
	(impl_ephy_automation_loadurl), (impl_ephy_automation_addBookmark),
	(impl_ephy_automation_importBookmarks),
	(impl_ephy_automation_loadSessionWithStartupId),
	(impl_ephy_automation_loadSession),
	(impl_ephy_automation_openBookmarksEditorWithStartupId),
	(impl_ephy_automation_openBookmarksEditor),
	(ephy_automation_class_init):
	* src/ephy-main.c: (get_startup_id), (main):
	* src/ephy-session.c: (offer_to_resume), (ephy_session_autoresume),
	(ephy_session_load):
	* src/ephy-session.h:
	* src/ephy-shell.c: (open_urls), (ephy_shell_startup),
	(ephy_shell_new_tab_full), (ephy_shell_new_tab):
	* src/ephy-shell.h:

	Implement startup ID forwarding to the already-running ephy instance.
	Part of bug #150085.
---
 doc/reference/tmpl/ephy-embed.sgml   | 2 ++
 doc/reference/tmpl/ephy-session.sgml | 2 ++
 doc/reference/tmpl/ephy-shell.sgml   | 1 +
 3 files changed, 5 insertions(+)

(limited to 'doc/reference')

diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 8f7eddc2f..fe5145716 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -211,6 +211,8 @@ be done by casting).
 @: 
 @:
 @: 
+@:
+@: 
 @: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
diff --git a/doc/reference/tmpl/ephy-session.sgml b/doc/reference/tmpl/ephy-session.sgml
index 4b3e753a3..6036738f2 100644
--- a/doc/reference/tmpl/ephy-session.sgml
+++ b/doc/reference/tmpl/ephy-session.sgml
@@ -40,6 +40,7 @@ ephy-session
 
 @session: 
 @filename: 
+@user_time: 
 @Returns: 
 
 
@@ -49,6 +50,7 @@ ephy-session
 </para>
 
 @session: 
+@user_time: 
 @Returns: 
 
 
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index 570c6a038..e0df50d62 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -87,6 +87,7 @@ ephy-shell
 
 @shell: 
 @flags: 
+@startup_id: 
 @args: 
 @string_arg: 
 @error: 
-- 
cgit v1.2.3