[epiphany] Do not show the security status in the statusbar

[Xan Lopez <xan src gnome org>]

commit 97f589c9500324e55fb162cf815ec37a4a96ac63
Author: Xan Lopez <xan gnome org>
Date:   Wed May 12 14:46:48 2010 +0200

    Do not show the security status in the statusbar
    
    It's already shown in the URL entry, so it's redundant. First step
    towards getting rid of the statusbar for good...

 doc/reference/epiphany-sections.txt |    2 -
 src/ephy-statusbar.c                |   45 -----------------------------------
 src/ephy-statusbar.h                |    6 ----
 src/ephy-window.c                   |    3 --
 4 files changed, 0 insertions(+), 56 deletions(-)
---
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index cb470fe..4757957 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -219,9 +219,7 @@ ephy_location_action_set_address
 <TITLE>EphyStatusbar</TITLE>
 EphyStatusbar
 ephy_statusbar_new
-ephy_statusbar_get_security_frame
 ephy_statusbar_set_caret_mode
-ephy_statusbar_set_security_state
 ephy_statusbar_set_popups_state
 ephy_statusbar_add_widget
 ephy_statusbar_remove_widget
diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index dfcd85b..4798d5d 100644
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -46,8 +46,6 @@ struct _EphyStatusbarPrivate
 	GtkWidget *icon_container;
 
 	GtkWidget *caret_indicator;
-	GtkWidget *security_icon;
-	GtkWidget *security_evbox;
 	GtkWidget *popups_manager_icon;
 	GtkWidget *popups_manager_evbox;
 };
@@ -183,14 +181,6 @@ ephy_statusbar_init (EphyStatusbar *t)
 	gtk_widget_show (priv->hbox);
 #endif
 
-	/* Create security icon */
-	create_icon_frame (t,
-			   NULL,
-			   G_CALLBACK (padlock_button_press_cb),
-			   &priv->security_evbox,
-			   &priv->security_icon);
-	gtk_widget_show (priv->security_evbox);
-
 	/* Create popup-blocked icon */
 	create_icon_frame (t,
 			   EPHY_STOCK_POPUPS,
@@ -234,27 +224,6 @@ ephy_statusbar_set_caret_mode (EphyStatusbar *statusbar,
 }
 
 /**
- * ephy_statusbar_set_security_state:
- * @statusbar: an #EphyStatusbar
- * @stock_id: stock-id of the icon showing the security state
- * @tooltip: a string detailing the security state
- * 
- * Sets the statusbar's security icon and its tooltip.
- **/
-void
-ephy_statusbar_set_security_state (EphyStatusbar *statusbar,
-				   const char *stock_id,
-				   const char *tooltip)
-{
-	EphyStatusbarPrivate *priv = statusbar->priv;
-
-	gtk_image_set_from_stock (GTK_IMAGE (priv->security_icon),
-				  stock_id, GTK_ICON_SIZE_MENU);
-
-	gtk_widget_set_tooltip_text (priv->security_icon, tooltip);
-}
-
-/**
  * ephy_statusbar_set_popups_state:
  * @statusbar: an #EphyStatusbar
  * @hidden: %TRUE if popups have been hidden
@@ -358,17 +327,3 @@ ephy_statusbar_remove_widget (EphyStatusbar *statusbar,
 	gtk_container_remove (GTK_CONTAINER (priv->icon_container), vsep);
 	gtk_container_remove (GTK_CONTAINER (priv->icon_container), widget);
 }
-
-/**
- * ephy_statusbar_get_security_frame:
- * @statusbar: an #EphyStatusbar
- *
- * Return value: (transfer none): the statusbar's lock icon frame
- */
-GtkWidget *
-ephy_statusbar_get_security_frame (EphyStatusbar *statusbar)
-{
-	g_return_val_if_fail (EPHY_IS_STATUSBAR (statusbar), NULL);
-
-	return statusbar->priv->security_evbox;
-}
diff --git a/src/ephy-statusbar.h b/src/ephy-statusbar.h
index f6b3879..48eaafc 100644
--- a/src/ephy-statusbar.h
+++ b/src/ephy-statusbar.h
@@ -61,15 +61,9 @@ GType         ephy_statusbar_get_type			(void);
 
 GtkWidget    *ephy_statusbar_new			(void);
 
-GtkWidget    *ephy_statusbar_get_security_frame		(EphyStatusbar *statusbar);
-
 void	      ephy_statusbar_set_caret_mode		(EphyStatusbar *statusbar,
 							 gboolean enabled);
 
-void          ephy_statusbar_set_security_state		(EphyStatusbar *statusbar,
-							 const char *stock_id,
-							 const char *tooltip);
-
 void          ephy_statusbar_set_popups_state		(EphyStatusbar *statusbar,
 							 gboolean hidden,
 							 const char *tooltip);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f3125d6..b65ff20 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1741,9 +1741,6 @@ sync_tab_security (EphyWebView *view,
 		g_free (tmp);
 	}
 
-	ephy_statusbar_set_security_state (EPHY_STATUSBAR (priv->statusbar),
-					   stock_id, tooltip);
-
 	ephy_toolbar_set_security_state (priv->toolbar, is_secure,
 					 show_lock, stock_id, tooltip);