Fix signal parameter, and add a NULL check. Fixes bug #131117, patch by

2004-01-10  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-window.c: (update_exit_fullscreen_popup_position),
	(ephy_window_fullscreen):

	Fix signal parameter, and add a NULL check. Fixes bug #131117,
	patch by Martin Kretzschmar. (Backported from HEAD.)

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 52918c215..24a15b4cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-01-10  Christian Persch  <chpe@cvs.gnome.org>
 
+	* src/ephy-window.c: (update_exit_fullscreen_popup_position),
+	(ephy_window_fullscreen):
+
+	Fix signal parameter, and add a NULL check. Fixes bug #131117,
+	patch by Martin Kretzschmar. (Backported from HEAD.)
+        
+2004-01-10  Christian Persch  <chpe@cvs.gnome.org>
+
 	* src/ephy-notebook.c: (ephy_notebook_finalize):
 
 	Call parent class' finalize method.
diff --git a/src/ephy-window.c b/src/ephy-window.c
index a010e4689..b540bc518 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -470,6 +470,8 @@ update_exit_fullscreen_popup_position (EphyWindow *window)
 	GdkRectangle screen_rect;
 	int popup_height;
 
+	g_return_if_fail (window->priv->exit_fullscreen_popup != NULL);
+
 	gtk_window_get_size (GTK_WINDOW (window->priv->exit_fullscreen_popup),
                              NULL, &popup_height);
 
@@ -581,7 +583,7 @@ ephy_window_fullscreen (EphyWindow *window)
 
 	g_signal_connect (G_OBJECT (gdk_screen_get_default ()),
                           "size-changed", G_CALLBACK (size_changed_cb),
-			  popup);
+			  window);
 
 	update_chromes_visibility (window, window->priv->chrome_mask);
 }