Merge EphyApplication into Ephy(Embed)Shell

We want to use EphyApplication from embed/ too, so instead of
following the EphyEmbedShell/EphyShell pattern just fold the code into
the Shell itself. This makes sense since both classes have basically
the same function, and we can easily leave the non-embed code in
EphyShell and move to EphyEmbedShell the bits we want to be global.

The better name would be EphyCoreApplication/EphyApplication for the
resulting object, but we can do this later.

1 files changed, 6 insertions, 2 deletions

diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 00087fa9b..c91dc9d80 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -1,5 +1,7 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright © 2000-2003 Marco Pesenti Gritti
+ *  Copyright © 2011 Igalia S.L.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,7 +49,7 @@ extern EphyEmbedShell *embed_shell;
 
 struct _EphyEmbedShell
 {
-	GObject parent;
+	GtkApplication parent;
 
 	/*< private >*/
 	EphyEmbedShellPrivate *priv;
@@ -55,7 +57,7 @@ struct _EphyEmbedShell
 
 struct _EphyEmbedShellClass
 {
-	GObjectClass parent_class;
+	GtkApplicationClass parent_class;
 
 	void	  (* download_added)	(EphyEmbedShell *shell, EphyDownload *download);
 	void	  (* download_removed)	(EphyEmbedShell *shell, EphyDownload *download);
@@ -99,6 +101,8 @@ void		   ephy_embed_shell_add_download	(EphyEmbedShell *shell,
 void		   ephy_embed_shell_remove_download	(EphyEmbedShell *shell,
 							 EphyDownload *download);
 
+gboolean           ephy_embed_shell_is_private_instance (EphyEmbedShell *shell);
+
 /* Private API */
 void	       _ephy_embed_shell_track_object		(EphyEmbedShell *shell,
 							 GObject        *object);