From 16271c95a5cbf5d797f1f5bf2b1016398b9fa0c9 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Fri, 20 Jan 2012 12:45:31 +0100 Subject: ephy-window: remove duplicated method ephy_window_set_location and _ephy_window_set_location were identical. Remove the latter. --- src/ephy-window.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/ephy-window.c b/src/ephy-window.c index 94f3d2a70..ec9916383 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1511,19 +1511,6 @@ setup_ui_manager (EphyWindow *window) gtk_ui_manager_get_accel_group (manager)); } -static void -_ephy_window_set_location (EphyWindow *window, - const char *address) -{ - EphyWindowPrivate *priv = window->priv; - - if (priv->updating_address) return; - - priv->updating_address = TRUE; - ephy_location_controller_set_address (priv->location_controller, address); - priv->updating_address = FALSE; -} - static void sync_tab_address (EphyWebView *view, GParamSpec *pspec, @@ -1538,7 +1525,7 @@ sync_tab_address (EphyWebView *view, address = ephy_web_view_get_address (view); typed_address = ephy_web_view_get_typed_address (view); - _ephy_window_set_location (window, typed_address ? typed_address : address); + ephy_window_set_location (window, typed_address ? typed_address : address); ephy_find_toolbar_request_close (priv->find_toolbar); } @@ -2796,7 +2783,7 @@ embed_modal_alert_cb (EphyEmbed *embed, /* make sure the location entry shows the real URL of the tab's page */ address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); - _ephy_window_set_location (window, address); + ephy_window_set_location (window, address); /* don't suppress alert */ return FALSE; -- cgit v1.2.3