aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ephy-history-window.c14
-rw-r--r--src/ephy-location-action.c25
-rw-r--r--src/ephy-location-action.h2
-rwxr-xr-xsrc/toolbar.c12
-rw-r--r--src/toolbar.h2
5 files changed, 3 insertions, 52 deletions
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 8db577231..22e1d3b68 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -223,25 +223,11 @@ static void
confirmation_dialog_response_cb (GtkDialog *dialog, gint response,
EphyHistoryWindow *editor)
{
- const GList *windows;
- Session *session;
-
gtk_widget_destroy (GTK_WIDGET (dialog));
if (response != GTK_RESPONSE_OK)
return;
- session = EPHY_SESSION (ephy_shell_get_session (ephy_shell));
- windows = session_get_windows (session);
-
- for (; windows != NULL; windows = windows->next)
- {
- Toolbar *t;
-
- t = ephy_window_get_toolbar (EPHY_WINDOW (windows->data));
- toolbar_clear_location_history (t);
- }
-
ephy_history_clear (editor->priv->history);
}
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 0d90e8e24..73568195a 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -172,7 +172,7 @@ remove_completion_actions (GtkAction *action, GtkWidget *proxy)
EphyLocationAction *la = EPHY_LOCATION_ACTION (action);
GList *l;
- entry = ephy_location_entry_get_entry (EPHY_LOCATION_ENTRY (proxy));
+ entry = GTK_BIN (proxy)->child;
completion = gtk_entry_get_completion (GTK_ENTRY (entry));
for (l = la->priv->actions; l != NULL; l = l->next)
@@ -195,7 +195,7 @@ add_completion_actions (GtkAction *action, GtkWidget *proxy)
EphyLocationAction *la = EPHY_LOCATION_ACTION (action);
GList *l;
- entry = ephy_location_entry_get_entry (EPHY_LOCATION_ENTRY (proxy));
+ entry = GTK_BIN (proxy)->child;
completion = gtk_entry_get_completion (GTK_ENTRY (entry));
for (l = la->priv->actions; l != NULL; l = l->next)
@@ -238,7 +238,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
g_signal_connect_object (action, "notify::address",
G_CALLBACK (sync_address), proxy, 0);
- entry = ephy_location_entry_get_entry (EPHY_LOCATION_ENTRY (proxy));
+ entry = GTK_BIN (proxy)->child;
g_signal_connect_object (entry, "activate",
G_CALLBACK (location_url_activate_cb),
action, 0);
@@ -478,22 +478,3 @@ ephy_location_action_set_address (EphyLocationAction *action,
action->priv->address = g_strdup (address ? address : "");
g_object_notify (G_OBJECT (action), "address");
}
-
-static void
-clear_history (GtkWidget *proxy, gpointer user_data)
-{
- if (EPHY_IS_LOCATION_ENTRY (proxy))
- {
- ephy_location_entry_clear_history (EPHY_LOCATION_ENTRY (proxy));
- }
-}
-
-void
-ephy_location_action_clear_history (EphyLocationAction *action)
-{
- GSList *proxies;
-
- proxies = gtk_action_get_proxies (GTK_ACTION (action));
-
- g_slist_foreach (proxies, (GFunc) clear_history, NULL);
-}
diff --git a/src/ephy-location-action.h b/src/ephy-location-action.h
index 8058eb64f..74de3b175 100644
--- a/src/ephy-location-action.h
+++ b/src/ephy-location-action.h
@@ -57,8 +57,6 @@ const char *ephy_location_action_get_address (EphyLocationAction *action);
void ephy_location_action_set_address (EphyLocationAction *action,
const char *address);
-void ephy_location_action_clear_history (EphyLocationAction *action);
-
G_END_DECLS
#endif
diff --git a/src/toolbar.c b/src/toolbar.c
index a1b4553f1..025938e34 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -644,18 +644,6 @@ toolbar_get_location (Toolbar *t)
}
void
-toolbar_clear_location_history (Toolbar *t)
-{
- GtkActionGroup *action_group;
- GtkAction *action;
-
- action_group = t->priv->action_group;
- action = gtk_action_group_get_action (action_group, "Location");
-
- ephy_location_action_clear_history (EPHY_LOCATION_ACTION (action));
-}
-
-void
toolbar_update_navigation_actions (Toolbar *t, gboolean back, gboolean forward, gboolean up)
{
GtkActionGroup *action_group;
diff --git a/src/toolbar.h b/src/toolbar.h
index f62021a20..6e4fecdf2 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -63,8 +63,6 @@ void toolbar_set_location (Toolbar *t,
void toolbar_activate_location (Toolbar *t);
-void toolbar_clear_location_history (Toolbar *t);
-
void toolbar_update_favicon (Toolbar *t);
void toolbar_update_navigation_actions (Toolbar *t,