Count the blocked handlers and warn if it's not the expected numberr, so

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

	* embed/mozilla/mozilla-embed.cpp: (mozilla_embed_realize):

	Count the blocked handlers and warn if it's not the expected numberr,
	so we know if our focos fix assumptions become invalid.

2 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f4d0636c..5eecf87bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-07-30  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/mozilla/mozilla-embed.cpp: (mozilla_embed_realize):
+
+	Count the blocked handlers and warn if it's not the expected numberr,
+	so we know if our focos fix assumptions become invalid.
+
+2005-07-30  Christian Persch  <chpe@cvs.gnome.org>
+
 	* lib/ephy-debug.c: (trap_handler), (ephy_debug_init):
 
 	ALlow EPHY_DEBUG_BREAK even in non-debug builds.
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 1d96f65a4..8a7730f5e 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -254,12 +254,18 @@ mozilla_embed_realize (GtkWidget *widget)
 	GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
 	gpointer data = ((GtkMozEmbed *) widget)->data;
 
-	g_signal_handlers_block_matched (toplevel,
+	guint n;
+
+	n = g_signal_handlers_block_matched (toplevel,
 					 (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
 					 fiesid, 0, NULL, NULL, data);
-	g_signal_handlers_block_matched (toplevel,
+	n += g_signal_handlers_block_matched (toplevel,
 					 (GSignalMatchType) (G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
 					 foesid, 0, NULL, NULL, data);
+	if (n != 2)
+	{
+		g_warning ("Unexpected (n=%d) focus handlers found!\n");
+	}
 
 	if (mpriv->focus_connected) return;