[epiphany] Stop propagating the "secure" boolean to the location action

[Xan Lopez <xan src gnome org>]

commit fb5aebd75337d9602de157670300e0a4a3473b91
Author: Xan Lopez <xlopez igalia com>
Date:   Sun May 22 12:29:47 2011 +0200

    Stop propagating the "secure" boolean to the location action
    
    It was only used to figure out whether to paint the entry background
    yellow, so we don't need it anymore.

 src/ephy-location-action.c |   21 ---------------------
 src/ephy-toolbar.c         |    5 -----
 src/ephy-toolbar.h         |    1 -
 src/ephy-window.c          |    3 +--
 4 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index ac9f1cf..283d232 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -57,7 +57,6 @@ struct _EphyLocationActionPrivate
 	char *lock_tooltip;
 	guint editable : 1;
 	guint show_lock : 1;
-	guint secure : 1;
 	gboolean sync_address_is_blocked;
 };
 
@@ -78,7 +77,6 @@ enum
 	PROP_ICON,
 	PROP_LOCK_STOCK,
 	PROP_LOCK_TOOLTIP,
-	PROP_SECURE,
 	PROP_SHOW_LOCK,
 	PROP_WINDOW
 };
@@ -580,9 +578,6 @@ ephy_location_action_set_property (GObject *object,
 			g_free (priv->lock_tooltip);
 			priv->lock_tooltip = g_value_dup_string (value);
 			break;
-		case PROP_SECURE:
-			priv->secure = g_value_get_boolean (value);
-			break;
 		case PROP_SHOW_LOCK:
 			priv->show_lock = g_value_get_boolean (value);
 			break;
@@ -618,9 +613,6 @@ ephy_location_action_get_property (GObject *object,
 		case PROP_LOCK_TOOLTIP:
 			g_value_set_string (value, priv->lock_tooltip);
 			break;
-		case PROP_SECURE:
-			g_value_set_boolean (value, priv->secure);
-			break;
 		case PROP_SHOW_LOCK:
 			g_value_set_boolean (value, priv->show_lock);
 			break;
@@ -727,19 +719,6 @@ ephy_location_action_class_init (EphyLocationActionClass *class)
 							       G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 
 	/**
-	* EphyLocationAction:secure:
-	*
-	* Whether the current page is loaded over a secure connection.
-	*/
-	g_object_class_install_property (object_class,
-					 PROP_SECURE,
-					 g_param_spec_boolean ("secure",
-							       "Secure",
-							       "Whether the current page is loaded over a secure connection",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
-	/**
 	* EphyLocationAction:show-lock:
 	*
 	* If we should show the security icon.
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 4bec114..c67076d 100644
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -76,7 +76,6 @@ struct _EphyToolbarPrivate
 
 	guint updating_address : 1;
 	guint show_lock : 1;
-	guint is_secure : 1;
 	guint leave_fullscreen_visible : 1;
 	guint spinning : 1;
 };
@@ -534,7 +533,6 @@ ephy_toolbar_set_navigation_tooltips (EphyToolbar *toolbar,
 /**
  * ephy_toolbar_set_security_state:
  * @toolbar: an #EphyToolbar widget
- * @is_secure: %TRUE if the page is loaded over a secure connection
  * @show_lock: %TRUE to show the lock icon in the location entry
  * @stock_id: stock-id to be used as the lock icon
  * @tooltip: tooltip for the lock icon
@@ -543,7 +541,6 @@ ephy_toolbar_set_navigation_tooltips (EphyToolbar *toolbar,
  **/
 void
 ephy_toolbar_set_security_state (EphyToolbar *toolbar,
-				 gboolean is_secure,
 				 gboolean show_lock,
 				 const char *stock_id,
 				 const char *tooltip)
@@ -551,13 +548,11 @@ ephy_toolbar_set_security_state (EphyToolbar *toolbar,
 	EphyToolbarPrivate *priv = toolbar->priv;
 
 	priv->show_lock = show_lock != FALSE;
-	priv->is_secure = is_secure != FALSE;
 
 	g_object_set (priv->actions[LOCATION_ACTION],
 		      "lock-stock-id", stock_id,
 		      "lock-tooltip", tooltip,
 		      "show-lock", priv->show_lock,
-		      "secure", is_secure,
 		      NULL);
 }
 
diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h
index 3225436..6b95c64 100644
--- a/src/ephy-toolbar.h
+++ b/src/ephy-toolbar.h
@@ -93,7 +93,6 @@ void		ephy_toolbar_set_navigation_tooltips	(EphyToolbar *toolbar,
 							 const char *forward_title);
 
 void		ephy_toolbar_set_security_state		(EphyToolbar *toolbar,
-							 gboolean is_secure,
 							 gboolean show_lock,
 							 const char *stock_id,
 							 const char *tooltip);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index d0d4135..a4c8bec 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1802,8 +1802,7 @@ sync_tab_security (EphyWebView *view,
 		g_free (tmp);
 	}
 
-	ephy_toolbar_set_security_state (priv->toolbar, is_secure,
-					 show_lock, stock_id, tooltip);
+	ephy_toolbar_set_security_state (priv->toolbar, show_lock, stock_id, tooltip);
 
 	if (priv->fullscreen_popup != NULL)
 	{