From 9368affd35e74c7e058fa37e81e9aa8c0b933513 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 17 Oct 2005 21:21:40 +0000 Subject: Remove lock visibility setter. 2005-10-17 Christian Persch * src/ephy-toolbar.c: (ephy_toolbar_set_security_state), (ephy_toolbar_init): * src/ephy-toolbar.h: Remove lock visibility setter. * src/window-commands.c: (window_cmd_help_about): Add Peter Harvey to about credits. --- src/ephy-toolbar.c | 18 +----------------- src/ephy-toolbar.h | 3 --- src/window-commands.c | 1 + 3 files changed, 2 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index 26af93311..0d2ef6bbc 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -80,7 +80,6 @@ struct _EphyToolbarPrivate guint updating_address : 1; guint show_lock : 1; guint is_secure : 1; - guint lock_visible : 1; guint leave_fullscreen_visible : 1; guint spinning : 1; }; @@ -469,24 +468,11 @@ ephy_toolbar_set_security_state (EphyToolbar *toolbar, g_object_set (priv->actions[LOCATION_ACTION], "lock-stock-id", stock_id, "lock-tooltip", tooltip, - "show-lock", priv->lock_visible && priv->show_lock, + "show-lock", priv->show_lock, "secure", is_secure, NULL); } -void -ephy_toolbar_set_lock_visibility (EphyToolbar *toolbar, - gboolean visible) -{ - EphyToolbarPrivate *priv = toolbar->priv; - - priv->lock_visible = visible != FALSE; - - g_object_set (priv->actions[LOCATION_ACTION], - "show-lock", priv->lock_visible && priv->show_lock, - NULL); -} - void ephy_toolbar_set_spinning (EphyToolbar *toolbar, gboolean spinning) @@ -549,8 +535,6 @@ ephy_toolbar_init (EphyToolbar *toolbar) EphyToolbarPrivate *priv; priv = toolbar->priv = EPHY_TOOLBAR_GET_PRIVATE (toolbar); - - priv->lock_visible = TRUE; } static GObject * diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h index 026588448..8cb954edd 100644 --- a/src/ephy-toolbar.h +++ b/src/ephy-toolbar.h @@ -90,9 +90,6 @@ void ephy_toolbar_set_security_state (EphyToolbar *toolbar, const char *stock_id, const char *tooltip); -void ephy_toolbar_set_lock_visibility (EphyToolbar *toolbar, - gboolean visible); - void ephy_toolbar_set_spinning (EphyToolbar *toolbar, gboolean spinning); diff --git a/src/window-commands.c b/src/window-commands.c index 4ec865a86..6d555857f 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -738,6 +738,7 @@ window_cmd_help_about (GtkAction *action, "", _("Contributors:"), "Crispin Flowerday", + "Peter Harvey", "Raphaƫl Slinckx", "", _("Past developers:"), -- cgit v1.2.3