diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rwxr-xr-x | src/ephy-toolbar.c | 18 | ||||
| -rw-r--r-- | src/ephy-toolbar.h | 3 | ||||
| -rw-r--r-- | src/window-commands.c | 1 |
4 files changed, 14 insertions, 20 deletions
@@ -1,3 +1,15 @@ +2005-10-17 Christian Persch <chpe@cvs.gnome.org> + + * 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. + 2005-10-17 Crispin Flowerday <gnome@flowerday.cx> * src/epiphany.override 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,25 +468,12 @@ 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:"), |