From a74877f7f28f105369acef053b339ceefce33c92 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@igalia.com>
Date: Tue, 13 Dec 2011 17:16:23 +0100
Subject: Remove ephy_window_get_toolbar

The only use in window-commands.c is not superfluous.
---
 doc/reference/epiphany-sections.txt |  1 -
 doc/reference/tmpl/ephy-window.sgml |  9 ---------
 src/ephy-window.c                   | 16 ----------------
 src/ephy-window.h                   |  2 --
 src/window-commands.c               |  3 ---
 5 files changed, 31 deletions(-)

diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index 6a5d47191..4bf362f81 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -228,7 +228,6 @@ EphyWindow
 ephy_window_new
 ephy_window_new_with_chrome
 ephy_window_get_ui_manager
-ephy_window_get_toolbar
 ephy_window_get_notebook
 ephy_window_get_find_toolbar
 ephy_window_load_url
diff --git a/doc/reference/tmpl/ephy-window.sgml b/doc/reference/tmpl/ephy-window.sgml
index 861065217..c1b4bc888 100644
--- a/doc/reference/tmpl/ephy-window.sgml
+++ b/doc/reference/tmpl/ephy-window.sgml
@@ -52,15 +52,6 @@ EphyWindow
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_window_get_toolbar ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
 <!-- ##### FUNCTION ephy_window_get_notebook ##### -->
 <para>
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 90a53bc0d..8b634292e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -4223,22 +4223,6 @@ ephy_window_get_ui_manager (EphyWindow *window)
 	return G_OBJECT (window->priv->manager);
 }
 
-/**
- * ephy_window_get_toolbar:
- * @window: an #EphyWindow
- *
- * Returns this window's toolbar
- *
- * Return value: (transfer none): an #EphyToolbar
- **/
-GtkWidget *
-ephy_window_get_toolbar (EphyWindow *window)
-{
-	g_return_val_if_fail (EPHY_IS_WINDOW (window), NULL);
-
-	return GTK_WIDGET (window->priv->toolbar);
-}
-
 /**
  * ephy_window_get_notebook:
  * @window: an #EphyWindow
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 1c2a3c600..40c1d8d2a 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -65,8 +65,6 @@ EphyWindow	 *ephy_window_new_with_chrome	  (EphyWebViewChrome chrome,
 
 GObject		 *ephy_window_get_ui_manager	  (EphyWindow *window);
 
-GtkWidget	 *ephy_window_get_toolbar	  (EphyWindow *window);
-
 GtkWidget	 *ephy_window_get_notebook	  (EphyWindow *window);
 
 GtkWidget        *ephy_window_get_find_toolbar    (EphyWindow *window);
diff --git a/src/window-commands.c b/src/window-commands.c
index 3fb876513..dfb59698b 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -887,9 +887,6 @@ void
 window_cmd_view_fullscreen (GtkAction *action,
 			    EphyWindow *window)
 {
-	/* Otherwise the other toolbar layout shows briefly while switching */
-	gtk_widget_hide (ephy_window_get_toolbar (window));
-
 	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 	{
 		GtkWidget *toolbar_editor;
-- 
cgit v1.2.3