A lib/ephy-signal-accumulator.c: (ephy_signal_accumulator_object): A

2004-12-23  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-embed.c: (ephy_embed_base_init):
	* embed/ephy-embed.h:
	* embed/mozilla/mozilla-embed.cpp:
	* lib/Makefile.am:
	* lib/ephy-marshal.list:
	A lib/ephy-signal-accumulator.c: (ephy_signal_accumulator_object):
	A lib/ephy-signal-accumulator.h:
	* src/ephy-tab.c: (ephy_tab_new_window_cb):

	Fix new_window signal.

4 files changed, 89 insertions, 0 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index aef41faca..43e7de082 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,6 +20,7 @@ NOINST_H_FILES = \
 	ephy-node-common.h			\
 	ephy-prefs.h				\
 	ephy-shlib-loader.h			\
+	ephy-signal-accumulator.h		\
 	ephy-string.h				\
 	ephy-stock-icons.h			\
 	ephy-zoom.h
@@ -51,6 +52,7 @@ libephymisc_la_SOURCES = \
 	ephy-node-db.c				\
 	ephy-prefs.h				\
 	ephy-shlib-loader.c			\
+	ephy-signal-accumulator.c		\
 	ephy-state.c				\
 	ephy-string.c				\
 	ephy-stock-icons.c			\
diff --git a/lib/ephy-marshal.list b/lib/ephy-marshal.list
index 81c0ffc7e..6e9daa24b 100644
--- a/lib/ephy-marshal.list
+++ b/lib/ephy-marshal.list
@@ -2,6 +2,7 @@ INT:STRING
 BOOLEAN:OBJECT
 BOOLEAN:STRING, STRING
 BOOLEAN:VOID
+OBJECT:ENUM
 VOID:ENUM
 VOID:ENUM,INT,BOOLEAN
 VOID:INT,INT
diff --git a/lib/ephy-signal-accumulator.c b/lib/ephy-signal-accumulator.c
new file mode 100644
index 000000000..d34273721
--- /dev/null
+++ b/lib/ephy-signal-accumulator.c
@@ -0,0 +1,50 @@
+/*
+*  Copyright (C) 2004 Christian Persch
+*
+*  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
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program; if not, write to the Free Software
+*  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*
+*  $Id$
+*/
+
+#include "config.h"
+
+#include "ephy-signal-accumulator.h"
+
+typedef GType (* GetTypeFunc)	(void);
+
+gboolean
+ephy_signal_accumulator_object (GSignalInvocationHint *ihint,
+				GValue *return_accu,
+				const GValue *handler_return,
+				gpointer accu_data)
+{
+	GObject *object;
+	GetTypeFunc get_type = (GetTypeFunc) accu_data;
+
+	object = g_value_get_object (handler_return);
+	if (object != NULL &&
+	    G_TYPE_CHECK_INSTANCE_TYPE (object, get_type ()))
+	{
+		g_value_set_object (return_accu, object);
+
+		return FALSE;
+	}
+	else if (object != NULL)
+	{
+		g_return_val_if_reached (TRUE);
+	}
+
+	return TRUE;
+}
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
new file mode 100644
index 000000000..8991bcf12
--- /dev/null
+++ b/lib/ephy-signal-accumulator.h
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (C) 2004 Christian Persch
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
+ */
+
+#ifndef EPHY_SIGNAL_ACCUMULATORS_H
+#define EPHY_SIGNAL_ACCUMULATORS_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+gboolean ephy_signal_accumulator_object (GSignalInvocationHint *ihint,
+					 GValue *return_accu,
+					 const GValue *handler_return,
+					 gpointer accu_data);
+
+
+G_END_DECLS
+
+#endif /* EPHY_SIGNAL_ACCUMULATORS_H */