From 415411682db49f95b121d27e94d3918445d391bf Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@it.gnome.org>
Date: Thu, 6 Feb 2003 11:18:05 +0000
Subject: Clear also location history when clearing history. Doesnt update

2003-02-06  Marco Pesenti Gritti  <marco@it.gnome.org>

	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_clear_history):
	* lib/widgets/ephy-location-entry.h:
	* src/history-dialog.c: (history_clear_button_clicked_cb):
	* src/toolbar.c: (toolbar_clear_location_history):
	* src/toolbar.h:

	Clear also location history when clearing history.
	Doesnt update immediately, gtk/gnome bug, will submit
	patches.
---
 ChangeLog                         | 13 +++++++++++++
 lib/widgets/ephy-location-entry.c |  6 ++++++
 lib/widgets/ephy-location-entry.h |  1 +
 src/history-dialog.c              | 15 +++++++++++++++
 src/toolbar.c                     | 15 +++++++++++++++
 src/toolbar.h                     |  2 ++
 6 files changed, 52 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 021a90e5e..547cd6dc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-02-06  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* lib/widgets/ephy-location-entry.c:
+	(ephy_location_entry_clear_history):
+	* lib/widgets/ephy-location-entry.h:
+	* src/history-dialog.c: (history_clear_button_clicked_cb):
+	* src/toolbar.c: (toolbar_clear_location_history):
+	* src/toolbar.h:
+
+	Clear also location history when clearing history.
+	Doesnt update immediately, gtk/gnome bug, will submit
+	patches.
+
 2003-02-05  James Willcox  <jwillcox@gnome.org>
 
 	* src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder),
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 545c3bcaa..2c7f96ed8 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -716,3 +716,9 @@ ephy_location_entry_set_autocompletion_key (EphyLocationEntry *e)
 	}
 }
 
+void
+ephy_location_entry_clear_history (EphyLocationEntry *w)
+{
+	gnome_entry_clear_history (GNOME_ENTRY (w->priv->combo));
+}
+
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index d292ffb0c..c56a25cc7 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -70,5 +70,6 @@ gchar		       *ephy_location_entry_get_location	(EphyLocationEntry *w);
 void			ephy_location_entry_set_autocompletion  (EphyLocationEntry *w,
 								 EphyAutocompletion *ac);
 void			ephy_location_entry_activate		(EphyLocationEntry *w);
+void			ephy_location_entry_clear_history	(EphyLocationEntry *w);
 
 #endif
diff --git a/src/history-dialog.c b/src/history-dialog.c
index 3ac3be2c7..4c32327a3 100755
--- a/src/history-dialog.c
+++ b/src/history-dialog.c
@@ -27,6 +27,7 @@
 #include "eggtreemodelfilter.h"
 #include "eggtreemultidnd.h"
 #include "ephy-tree-model-sort.h"
+#include "toolbar.h"
 
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreestore.h>
@@ -474,5 +475,19 @@ void
 history_clear_button_clicked_cb (GtkWidget *button,
 			         HistoryDialog *dialog)
 {
+	const GList *windows;
+	Session *session;
+
+	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 (dialog->priv->gh);
 }
diff --git a/src/toolbar.c b/src/toolbar.c
index 1df62677c..5ae01edc2 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -468,6 +468,21 @@ toolbar_get_location (Toolbar *t)
 		(EPHY_LOCATION_ENTRY (location));
 }
 
+void
+toolbar_clear_location_history (Toolbar *t)
+{
+	EggAction *action;
+	GtkWidget *location;
+
+	action = egg_action_group_get_action
+		(t->priv->action_group, "Location");
+	location = ephy_location_action_get_widget
+		(EPHY_LOCATION_ACTION (action));
+	g_return_if_fail (location != NULL);
+
+	ephy_location_entry_clear_history (EPHY_LOCATION_ENTRY (location));
+}
+
 void
 toolbar_update_navigation_actions (Toolbar *t, gboolean back, gboolean forward, gboolean up)
 {
diff --git a/src/toolbar.h b/src/toolbar.h
index 649156165..ac98f94c4 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -63,6 +63,8 @@ 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,
-- 
cgit v1.2.3