Moved the new_window_orphan signal to EphyEmbedSingle.

2003-04-16  Dave Camp  <dave@ximian.com>

	* embed/ephy-embed-shell.c: (ephy_embed_shell_class_init):
	* embed/ephy-embed-single.c: (ephy_embed_single_class_init):
	* src/ephy-shell.c: (ephy_shell_init): Moved the
	new_window_orphan signal to EphyEmbedSingle.

6 files changed, 32 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index f7561bb44..7d940bbbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-16  Dave Camp  <dave@ximian.com>
+
+	* embed/ephy-embed-shell.c: (ephy_embed_shell_class_init):
+	* embed/ephy-embed-single.c: (ephy_embed_single_class_init):
+	* src/ephy-shell.c: (ephy_shell_init): Moved the
+	new_window_orphan signal to EphyEmbedSingle.
+
 2003-04-16  Jeremy Katz <katzj@redhat.com>
 
 	* epiphany.spec: New file. Rpm spec.
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 3569590fa..37f57a1bf 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -28,7 +28,6 @@
 
 enum
 {
-	NEW_WINDOW,
 	COMMAND,
 	LAST_SIGNAL
 };
@@ -98,17 +97,6 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass)
 	klass->get_downloader_view = impl_get_downloader_view;
 	klass->get_global_history = impl_get_global_history;
 
-	ephy_embed_shell_signals[NEW_WINDOW] =
-                g_signal_new ("new_window_orphan",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedShellClass, new_window),
-                              NULL, NULL,
-                              ephy_marshal_VOID__POINTER_INT,
-                              G_TYPE_NONE,
-                              2,
-                              G_TYPE_POINTER,
-			      G_TYPE_INT);
 	ephy_embed_shell_signals[COMMAND] =
                 g_signal_new ("command",
                               G_OBJECT_CLASS_TYPE (object_class),
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index a5027bdfc..95bc2a160 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -55,10 +55,6 @@ struct EphyEmbedShellClass
 {
         GObjectClass parent_class;
 
-	void		(* new_window)          (EphyEmbedShell *shell,
-					         EphyEmbed **new_embed,
-						 EmbedChromeMask chromemask);
-
 	void		(* command)             (EphyEmbedShell *shell,
 						 char *command,
 						 char *param);
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index dd83b8039..071ed1b48 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -26,6 +26,12 @@
 
 #include <string.h>
 
+enum
+{
+	NEW_WINDOW,
+	LAST_SIGNAL
+};
+
 struct EphyEmbedSinglePrivate
 {
 	EphyHistory *global_history;
@@ -42,6 +48,7 @@ static void
 ephy_embed_single_finalize (GObject *object);
 
 static GObjectClass *parent_class = NULL;
+static guint ephy_embed_single_signals[LAST_SIGNAL] = { 0 };
 
 GType
 ephy_embed_single_get_type (void)
@@ -79,6 +86,18 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass)
 	parent_class = (GObjectClass *) g_type_class_peek_parent (klass);
 
         object_class->finalize = ephy_embed_single_finalize;
+
+	ephy_embed_single_signals[NEW_WINDOW] =
+                g_signal_new ("new_window_orphan",
+                              G_OBJECT_CLASS_TYPE (object_class),
+                              G_SIGNAL_RUN_LAST,
+                              G_STRUCT_OFFSET (EphyEmbedSingleClass, new_window),
+                              NULL, NULL,
+                              ephy_marshal_VOID__POINTER_INT,
+                              G_TYPE_NONE,
+                              2,
+                              G_TYPE_POINTER,
+			      G_TYPE_INT);
 }
 
 static void
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index d685ac475..174158db7 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -119,6 +119,11 @@ struct EphyEmbedSingleClass
 {
         GObjectClass parent_class;
 
+	/* Signals */
+	void		(* new_window)          (EphyEmbedSingle *shell,
+					         EphyEmbed **new_embed,
+						 EmbedChromeMask chromemask);
+
 	/* Methods */
 
 	gresult         (* clear_cache)         (EphyEmbedSingle *shell,
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index a4faae5d2..78506c19e 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -275,7 +275,7 @@ ephy_shell_init (EphyShell *gs)
 	/* This ensures mozilla is fired up */
 	single = ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (gs));
 
-	g_signal_connect (G_OBJECT (gs),
+	g_signal_connect (G_OBJECT (single),
 			  "new_window_orphan",
 			  G_CALLBACK(ephy_shell_new_window_cb),
 			  NULL);