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:

1 files changed, 20 insertions, 5 deletions

diff --git a/src/ephy-session.h b/src/ephy-session.h
index 025f8425d..2bdc26fd6 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -39,8 +39,19 @@ G_BEGIN_DECLS
 #define EPHY_SESSION_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SESSION, EphySessionClass))
 
 typedef struct _EphySession		EphySession;
-typedef struct _EphySessionClass	EphySessionClass;
 typedef struct _EphySessionPrivate	EphySessionPrivate;
+typedef struct _EphySessionClass	EphySessionClass;
+
+typedef enum
+{
+	EPHY_SESSION_CMD_RESUME_SESSION,
+	EPHY_SESSION_CMD_LOAD_SESSION,
+	EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR,
+	EPHY_SESSION_CMD_OPEN_URIS,
+	EPHY_SESSION_CMD_MAYBE_OPEN_WINDOW,
+	EPHY_SESSION_CMD_LAST
+	
+} EphySessionCommand;
 
 struct _EphySession
 {
@@ -66,9 +77,6 @@ gboolean	 ephy_session_load		(EphySession *session,
 						 const char *filename,
 						 guint32 user_time);
 
-gboolean	 ephy_session_autoresume	(EphySession *session,
-						 guint32 user_time);
-
 void		 ephy_session_close		(EphySession *session);
 
 GList		*ephy_session_get_windows	(EphySession *session);
@@ -76,9 +84,16 @@ GList		*ephy_session_get_windows	(EphySession *session);
 void		 ephy_session_add_window	(EphySession *session,
 						 GtkWindow *window);
 
-void		ephy_session_remove_window	(EphySession *session,
+void		 ephy_session_remove_window	(EphySession *session,
 						 GtkWindow *window);
 
+void		 ephy_session_queue_command	(EphySession *session,
+						 EphySessionCommand op,
+						 const char *arg,
+						 char **args,
+						 guint32 user_time,
+						 gboolean priority);
+
 G_END_DECLS
 
 #endif