ephy-window: remove ephy-fullscreen-popup

We're no longer using it

https://bugzilla.gnome.org/show_bug.cgi?id=671195

4 files changed, 0 insertions, 550 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index dc819de31..41f13c940 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,6 @@ NOINST_H_FILES = \
 	ephy-encoding-dialog.h			\
 	ephy-encoding-menu.h			\
 	ephy-find-toolbar.h			\
-	ephy-fullscreen-popup.h			\
 	ephy-history-window.h			\
 	ephy-home-action.h			\
 	ephy-link-action.h			\
@@ -61,7 +60,6 @@ libephymain_la_SOURCES = \
 	ephy-extension.c			\
 	ephy-extensions-manager.c		\
 	ephy-find-toolbar.c			\
-	ephy-fullscreen-popup.c			\
 	ephy-home-action.c			\
 	ephy-history-window.c			\
 	ephy-link.c				\
diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c
deleted file mode 100644
index 7713bf72e..000000000
--- a/src/ephy-fullscreen-popup.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* 
- *  Copyright © 2000-2004 Marco Pesenti Gritti
- *  Copyright © 2003-2005 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#include "ephy-fullscreen-popup.h"
-#include "ephy-debug.h"
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-#define EPHY_FULLSCREEN_POPUP_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_FULLSCREEN_POPUP, EphyFullscreenPopupPrivate))
-
-struct _EphyFullscreenPopupPrivate
-{
-	EphyWindow *window;
-	GtkWidget *frame;
-	GtkWidget *lock;
-	GtkWidget *lock_ebox;
-	GtkWidget *button;
-	guint show_button : 1;
-	guint spinning : 1;
-	guint show_lock : 1;
-};
-
-enum
-{
-	PROP_0,
-	PROP_WINDOW,
-};
-
-enum
-{
-	EXIT_CLICKED,
-	LOCK_CLICKED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (EphyFullscreenPopup, ephy_fullscreen_popup, GTK_TYPE_WINDOW)
-
-static void
-exit_button_clicked_cb (GtkWidget *button,
-			EphyFullscreenPopup *popup)
-{
-	g_signal_emit (popup, signals[EXIT_CLICKED], 0);
-}
-
-static gboolean
-lock_button_press_cb (GtkWidget *ebox,
-		      GdkEventButton *event,
-		      EphyFullscreenPopup *popup)
-{
-	if (event->type == GDK_BUTTON_PRESS && event->button == 1)
-	{
-		g_signal_emit (popup, signals[LOCK_CLICKED], 0);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-ephy_fullscreen_popup_update_visibility (EphyFullscreenPopup *popup)
-{
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-	gboolean show_frame;
-
-	show_frame = priv->spinning || priv->show_lock;
-
-	g_object_set (priv->button, "visible", priv->show_button,
-				    "sensitive", priv->show_button, NULL);
-	g_object_set (priv->frame, "visible", show_frame, NULL);
-	g_object_set (priv->lock_ebox, "visible", priv->show_lock, NULL);
-}
-
-static void
-ephy_fullscreen_popup_update_position (EphyFullscreenPopup *popup)
-{
-	GtkWidget *widget = GTK_WIDGET (popup);
-	GtkRequisition requisition;
-	GdkScreen *screen;
-	GdkRectangle screen_rect;
-	int popup_width;
-
-	gtk_widget_get_preferred_size (widget, &requisition, NULL);
-	popup_width = requisition.width;
-
-	screen = gtk_widget_get_screen (widget);
-	gdk_screen_get_monitor_geometry
-		(screen,
-		 gdk_screen_get_monitor_at_window (screen,
-						   gtk_widget_get_window (widget)),
-		 &screen_rect);
-
-	if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-	{
-		gtk_window_move (GTK_WINDOW (widget),
-				 screen_rect.x, screen_rect.y);
-	}
-	else
-	{
-		gtk_window_move (GTK_WINDOW (widget),
-				 screen_rect.x + screen_rect.width - popup_width,
-				 screen_rect.y);
-	}
-}
-
-static void
-ephy_fullscreen_popup_set_window (EphyFullscreenPopup *popup,
-				  EphyWindow *window)
-{
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-	GdkScreen *screen;
-
-	priv->window = window;
-
-	/* FIXME multihead: screen change? */
-	screen = gtk_widget_get_screen (GTK_WIDGET (priv->window));
-	g_signal_connect_swapped (screen, "size-changed",
-				  G_CALLBACK (ephy_fullscreen_popup_update_position), popup);
-}
-
-/* public functions */
-
-void
-ephy_fullscreen_popup_set_show_leave (EphyFullscreenPopup *popup,
-				      gboolean show_button)
-{
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-
-	priv->show_button = show_button;
-	ephy_fullscreen_popup_update_visibility (popup);
-}
-
-void
-ephy_fullscreen_popup_set_security_state (EphyFullscreenPopup *popup,
-					  gboolean show_lock,
-					  const char *stock,
-					  const char *tooltip)
-{
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-
-	priv->show_lock = show_lock != FALSE;
-	gtk_image_set_from_stock (GTK_IMAGE (priv->lock), stock, GTK_ICON_SIZE_BUTTON);
-	gtk_widget_set_tooltip_text (priv->lock, tooltip);
-
-	ephy_fullscreen_popup_update_visibility (popup);
-}
-
-/* Class implementation */
-
-static void
-ephy_fullscreen_popup_init (EphyFullscreenPopup *popup)
-{
-	EphyFullscreenPopupPrivate *priv;
-
-	priv = popup->priv = EPHY_FULLSCREEN_POPUP_GET_PRIVATE (popup);
-
-	priv->show_button = TRUE;
-}
-
-static GObject *
-ephy_fullscreen_popup_constructor (GType type,
-				   guint n_construct_properties,
-				   GObjectConstructParam *construct_params)
-
-{
-	GObject *object;
-	EphyFullscreenPopup *popup;
-	EphyFullscreenPopupPrivate *priv;
-	GtkWindow *window;
-	GtkWidget *hbox, *frame_hbox, *icon;
-
-	object = G_OBJECT_CLASS (ephy_fullscreen_popup_parent_class)->constructor (type,
-                                                                                   n_construct_properties,
-                                                                                   construct_params);
-
-	window = GTK_WINDOW (object);
-	popup = EPHY_FULLSCREEN_POPUP (window);
-	priv = popup->priv;
-
-	gtk_window_set_resizable (window, FALSE);
-
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
-	gtk_container_add (GTK_CONTAINER (window), hbox);
-	gtk_widget_show (hbox);
-
-	/* frame */
-	priv->frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->frame, FALSE, FALSE, 0);
-
-	frame_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
-	gtk_container_add (GTK_CONTAINER (priv->frame), frame_hbox);
-	gtk_widget_show (frame_hbox);
-
-	/* lock */
-	priv->lock = gtk_image_new ();
-	gtk_widget_show (priv->lock);
-
-	priv->lock_ebox = gtk_event_box_new ();
-	gtk_event_box_set_visible_window (GTK_EVENT_BOX (priv->lock_ebox), FALSE);
-	gtk_widget_add_events (priv->lock_ebox, GDK_BUTTON_PRESS_MASK);
-	g_signal_connect (priv->lock_ebox, "button-press-event",
-			  G_CALLBACK (lock_button_press_cb), popup);
-	gtk_container_add (GTK_CONTAINER (priv->lock_ebox), priv->lock);
-	gtk_box_pack_start (GTK_BOX (frame_hbox), priv->lock_ebox, FALSE, FALSE, 0);
-	gtk_widget_show (priv->lock_ebox);
-
-	/* exit button */
-	priv->button = gtk_button_new_with_label (_("Leave Fullscreen"));
-	icon = gtk_image_new_from_stock (GTK_STOCK_LEAVE_FULLSCREEN, GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image (GTK_BUTTON (priv->button), icon);
-	/* don't show the image! see bug #307818 */
-	g_signal_connect (priv->button, "clicked",
-			  G_CALLBACK (exit_button_clicked_cb), popup);
-	gtk_box_pack_start (GTK_BOX (hbox), priv->button, FALSE, FALSE, 0);
-	gtk_widget_show (priv->button);
-
-	ephy_fullscreen_popup_update_visibility (popup);
-
-	return object;
-}
-
-static void
-ephy_fullscreen_popup_finalize (GObject *object)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (object);
-	EphyFullscreenPopupPrivate *priv = popup->priv;
-	GdkScreen *screen;
-
-	screen = gtk_widget_get_screen (GTK_WIDGET (priv->window));
-	g_signal_handlers_disconnect_matched (screen, G_SIGNAL_MATCH_DATA,
-					      0, 0, NULL, NULL, popup);
-
-	g_signal_handlers_disconnect_matched (priv->window, G_SIGNAL_MATCH_DATA,
-					      0, 0, NULL, NULL, popup);
-
-	G_OBJECT_CLASS (ephy_fullscreen_popup_parent_class)->finalize (object);
-}
-
-static void
-ephy_fullscreen_popup_get_property (GObject *object,
-				  guint prop_id,
-				  GValue *value,
-				  GParamSpec *pspec)
-{
-	/* no readable properties */
-	g_assert_not_reached ();
-}
-
-static void
-ephy_fullscreen_popup_set_property (GObject *object,
-				  guint prop_id,
-				  const GValue *value,
-				  GParamSpec *pspec)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (object);
-
-	switch (prop_id)
-	{
-		case PROP_WINDOW:
-			ephy_fullscreen_popup_set_window (popup, g_value_get_object (value));
-			break;
-	}
-}
-
-static void
-ephy_fullscreen_popup_get_preferred_width (GtkWidget *widget,
-                                           gint *minimum,
-                                           gint *natural)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (widget);
-
-	GTK_WIDGET_CLASS (ephy_fullscreen_popup_parent_class)->get_preferred_width (widget, minimum, natural);
-
-	if (gtk_widget_get_realized (widget))
-	{
-		ephy_fullscreen_popup_update_position (popup);
-	}
-}
-
-static void
-ephy_fullscreen_popup_get_preferred_height (GtkWidget *widget,
-                                            gint *minimum,
-                                            gint *natural)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (widget);
-
-	GTK_WIDGET_CLASS (ephy_fullscreen_popup_parent_class)->get_preferred_height (widget, minimum, natural);
-
-	if (gtk_widget_get_realized (widget))
-	{
-		ephy_fullscreen_popup_update_position (popup);
-	}
-}
-
-static void
-ephy_fullscreen_popup_realize (GtkWidget *widget)
-{
-	EphyFullscreenPopup *popup = EPHY_FULLSCREEN_POPUP (widget);
-
-	GTK_WIDGET_CLASS (ephy_fullscreen_popup_parent_class)->realize (widget);
-
-	ephy_fullscreen_popup_update_position (popup);
-}
-
-static void
-ephy_fullscreen_popup_class_init (EphyFullscreenPopupClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-	object_class->constructor = ephy_fullscreen_popup_constructor;
-	object_class->finalize = ephy_fullscreen_popup_finalize;
-	object_class->get_property = ephy_fullscreen_popup_get_property;
-	object_class->set_property = ephy_fullscreen_popup_set_property;
-
-	widget_class->get_preferred_width = ephy_fullscreen_popup_get_preferred_width;
-	widget_class->get_preferred_height = ephy_fullscreen_popup_get_preferred_height;
-	widget_class->realize = ephy_fullscreen_popup_realize;
-
-	signals[EXIT_CLICKED] =
-		g_signal_new
-			("exit-clicked",
-			 EPHY_TYPE_FULLSCREEN_POPUP,
-			 G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET (EphyFullscreenPopupClass, exit_clicked),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE,
-			 0);
-	signals[LOCK_CLICKED] =
-		g_signal_new
-			("lock-clicked",
-			 EPHY_TYPE_FULLSCREEN_POPUP,
-			 G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_LAST,
-			 G_STRUCT_OFFSET (EphyFullscreenPopupClass, lock_clicked),
-			 NULL, NULL,
-			 g_cclosure_marshal_VOID__VOID,
-			 G_TYPE_NONE,
-			 0);
-
-	g_object_class_install_property (object_class,
-					 PROP_WINDOW,
-					 g_param_spec_object ("window",
-							      "Window",
-							      "Parent window",
-							      EPHY_TYPE_WINDOW,
-							      G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
-							      G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (object_class, sizeof (EphyFullscreenPopupPrivate));
-}
-
-GtkWidget *
-ephy_fullscreen_popup_new (EphyWindow *window)
-{
-	return g_object_new (EPHY_TYPE_FULLSCREEN_POPUP,
-			     "type", GTK_WINDOW_POPUP,
-			     "window", window,
-			     NULL);
-}
diff --git a/src/ephy-fullscreen-popup.h b/src/ephy-fullscreen-popup.h
deleted file mode 100644
index 65614bbd6..000000000
--- a/src/ephy-fullscreen-popup.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *  Copyright © 2000-2004 Marco Pesenti Gritti
- *  Copyright © 2003-2005 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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_FULLSCREEN_POPUP_H
-#define EPHY_FULLSCREEN_POPUP_H
-
-#include <gtk/gtk.h>
-#include "ephy-window.h"
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_FULLSCREEN_POPUP		(ephy_fullscreen_popup_get_type ())
-#define EPHY_FULLSCREEN_POPUP(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_FULLSCREEN_POPUP, EphyFullscreenPopup))
-#define EPHY_FULLSCREEN_POPUP_CLASS(k)  	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_FULLSCREEN_POPUP, EphyFullscreenPopupClass))
-#define EPHY_IS_FULLSCREEN_POPUP(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_FULLSCREEN_POPUP))
-#define EPHY_IS_FULLSCREEN_POPUP_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_FULLSCREEN_POPUP))
-#define EPHY_FULLSCREEN_POPUP_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_FULLSCREEN_POPUP, EphyFullscreenPopupClass))
-
-typedef struct _EphyFullscreenPopup		EphyFullscreenPopup;
-typedef struct _EphyFullscreenPopupPrivate	EphyFullscreenPopupPrivate;
-typedef struct _EphyFullscreenPopupClass	EphyFullscreenPopupClass;
-
-struct _EphyFullscreenPopup
-{
-	GtkWindow parent_instance;
-
-	/*< private >*/
-	EphyFullscreenPopupPrivate *priv;
-};
-
-struct _EphyFullscreenPopupClass
-{
-	GtkWindowClass parent_class;
-
-	void (* exit_clicked)	(EphyFullscreenPopup *popup);
-	void (* lock_clicked)	(EphyFullscreenPopup *popup);
-};
-
-GType	   ephy_fullscreen_popup_get_type	    (void);
-
-GtkWidget *ephy_fullscreen_popup_new		    (EphyWindow *window);
-
-void	   ephy_fullscreen_popup_set_show_leave	    (EphyFullscreenPopup *popup,
-						     gboolean show_button);
-
-void	   ephy_fullscreen_popup_set_security_state (EphyFullscreenPopup *popup,
-						     gboolean show_lock,
-						     const char *stock,
-						     const char *tooltip);
-
-G_END_DECLS
-
-#endif /* !EPHY_FULLSCREEN_POPUP_H */
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f1f76c307..18ce8d0db 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -39,7 +39,6 @@
 #include "ephy-extension.h"
 #include "ephy-file-helpers.h"
 #include "ephy-find-toolbar.h"
-#include "ephy-fullscreen-popup.h"
 #include "ephy-gui.h"
 #include "ephy-home-action.h"
 #include "ephy-link.h"
@@ -329,7 +328,6 @@ static const struct
 struct _EphyWindowPrivate
 {
 	GtkWidget *main_vbox;
-	GtkWidget *fullscreen_popup;
 	GtkWidget *toolbar;
 	GtkUIManager *manager;
 	GtkActionGroup *action_group;
@@ -663,33 +661,6 @@ settings_changed_cb (GtkSettings *settings)
 }
 
 static void
-destroy_fullscreen_popup (EphyWindow *window)
-{
-	if (window->priv->fullscreen_popup != NULL)
-	{
-		gtk_widget_destroy (window->priv->fullscreen_popup);
-		window->priv->fullscreen_popup = NULL;
-	}
-}
-
-static void
-exit_fullscreen_clicked_cb (EphyWindow *window)
-{
-	GtkAction *action;
-
-	action = gtk_action_group_get_action (window->priv->action_group, "ViewFullscreen");
-	g_return_if_fail (action != NULL);
-
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
-}
-
-static gboolean
-get_toolbar_visibility (EphyWindow *window)
-{
-	return ((window->priv->chrome & EPHY_WEB_VIEW_CHROME_TOOLBAR) != 0);
-}			
-
-static void
 get_chromes_visibility (EphyWindow *window,
 			gboolean *show_toolbar,
 			gboolean *show_tabsbar)
@@ -823,36 +794,16 @@ sync_tab_security (EphyWebView *view,
 	}
 
 	_ephy_window_set_security_state (window, show_lock, stock_id);
-
-	if (priv->fullscreen_popup != NULL)
-	{
-		ephy_fullscreen_popup_set_security_state
-			(EPHY_FULLSCREEN_POPUP (priv->fullscreen_popup),
-			 show_lock, stock_id, NULL);
-	}
 }
 
 static void
 ephy_window_fullscreen (EphyWindow *window)
 {
 	EphyWindowPrivate *priv = window->priv;
-	GtkWidget *popup;
 	EphyEmbed *embed;
-	gboolean lockdown_fs;
 
 	priv->fullscreen_mode = TRUE;
 
-	lockdown_fs = g_settings_get_boolean
-				(EPHY_SETTINGS_LOCKDOWN,
-				 EPHY_PREFS_LOCKDOWN_FULLSCREEN);
-
-	popup = ephy_fullscreen_popup_new (window);
-	ephy_fullscreen_popup_set_show_leave
-		(EPHY_FULLSCREEN_POPUP (popup), !lockdown_fs);
-	priv->fullscreen_popup = popup;
-	g_signal_connect_swapped (popup, "exit-clicked",
-				  G_CALLBACK (exit_fullscreen_clicked_cb), window);
-
 	/* sync status */
 	embed = window->priv->active_embed;
 	sync_tab_load_status (ephy_embed_get_web_view (embed), NULL, window);
@@ -866,8 +817,6 @@ ephy_window_unfullscreen (EphyWindow *window)
 {
 	window->priv->fullscreen_mode = FALSE;
 
-	destroy_fullscreen_popup (window);
-
 	sync_chromes_visibility (window);
 }
 
@@ -2975,8 +2924,6 @@ ephy_window_dispose (GObject *object)
 		_ephy_window_set_context_event (window, NULL);
 	}
 
-	destroy_fullscreen_popup (window);
-
 	G_OBJECT_CLASS (ephy_window_parent_class)->dispose (object);
 }
 
@@ -3032,36 +2979,6 @@ ephy_window_get_property (GObject *object,
 }
 
 static gboolean
-ephy_window_focus_in_event (GtkWidget *widget,
-			    GdkEventFocus *event)
-{
-	EphyWindow *window = EPHY_WINDOW (widget);
-	EphyWindowPrivate *priv = window->priv;
-
-	if (priv->fullscreen_popup && !get_toolbar_visibility (window))
-	{
-		gtk_widget_show (priv->fullscreen_popup);
-	}
-
-	return GTK_WIDGET_CLASS (ephy_window_parent_class)->focus_in_event (widget, event);
-}
-
-static gboolean
-ephy_window_focus_out_event (GtkWidget *widget,
-			     GdkEventFocus *event)
-{
-	EphyWindow *window = EPHY_WINDOW (widget);
-	EphyWindowPrivate *priv = window->priv;
-
-	if (priv->fullscreen_popup)
-	{
-		gtk_widget_hide (priv->fullscreen_popup);
-	}
-
-	return GTK_WIDGET_CLASS (ephy_window_parent_class)->focus_out_event (widget, event);
-}
-
-static gboolean
 ephy_window_state_event (GtkWidget *widget,
 			 GdkEventWindowState *event)
 {
@@ -3499,8 +3416,6 @@ ephy_window_class_init (EphyWindowClass *klass)
 
 	widget_class->show = ephy_window_show;
 	widget_class->key_press_event = ephy_window_key_press_event;
-	widget_class->focus_in_event = ephy_window_focus_in_event;
-	widget_class->focus_out_event = ephy_window_focus_out_event;
 	widget_class->window_state_event = ephy_window_state_event;
 	widget_class->delete_event = ephy_window_delete_event;
 
@@ -3689,11 +3604,6 @@ ephy_window_load_url (EphyWindow *window,
 void
 ephy_window_activate_location (EphyWindow *window)
 {
-	if (window->priv->fullscreen_popup)
-	{
-		gtk_widget_hide (window->priv->fullscreen_popup);
-	}
-
 	_ephy_window_activate_location (window);
 }