Remember the address in the location action, so we can restore it when we

2003-09-20  Christian Persch  <chpe@cvs.gnome.org>

	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_class_init),
	(ephy_location_entry_activation_finished), (location_focus_out_cb),
	(ephy_location_entry_init), (ephy_location_ignore_prefix),
	(ephy_location_entry_activate_cb),
	(ephy_location_entry_set_location),
	(ephy_location_entry_get_location), (ephy_location_entry_activate),
	(ephy_location_entry_editable_changed_cb),
	(ephy_location_entry_clear_history):
	* lib/widgets/ephy-location-entry.h:
	* src/ephy-location-action.c: (location_url_activate_cb),
	(user_changed_cb), (sync_address), (connect_proxy),
	(disconnect_proxy), (ephy_location_action_set_property),
	(ephy_location_action_get_property),
	(ephy_location_action_activate), (ephy_location_action_class_init),
	(ephy_location_action_init), (ephy_location_action_finalize),
	(ephy_location_action_get_address),
	(ephy_location_action_set_address), (clear_history),
	(ephy_location_action_clear_history):
	* src/ephy-location-action.h:
	* src/toolbar.c: (toolbar_class_init), (toolbar_set_property),
	(sync_user_input_cb), (toolbar_setup_actions),
	(toolbar_set_window), (toolbar_init), (toolbar_finalize),
	(toolbar_new), (toolbar_activate_location), (toolbar_set_location),
	(toolbar_get_location), (toolbar_clear_location_history):
	* src/toolbar.h:
	* src/window-commands.c: (window_cmd_load_location):

	Remember the address in the location action, so we can restore it when we
	get a new proxy widget.
	Do some misc cleanups on location entry, removing finished signal; move
	activation from toolbar into location entry.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/ephy-location-action.h b/src/ephy-location-action.h
index fd27ec8b8..8058eb64f 100644
--- a/src/ephy-location-action.h
+++ b/src/ephy-location-action.h
@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  $Id$
  */
 
 #ifndef EPHY_LOCATION_ACTION_H
@@ -30,12 +32,15 @@ G_BEGIN_DECLS
 #define EPHY_IS_LOCATION_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_LOCATION_ACTION))
 #define EPHY_LOCATION_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_LOCATION_ACTION, EphyLocationActionClass))
 
-typedef struct _EphyLocationAction      EphyLocationAction;
-typedef struct _EphyLocationActionClass EphyLocationActionClass;
-
+typedef struct _EphyLocationAction		EphyLocationAction;
+typedef struct _EphyLocationActionClass		EphyLocationActionClass;
+typedef struct _EphyLocationActionPrivate	EphyLocationActionPrivate;
+	
 struct _EphyLocationAction
 {
 	GtkAction parent;
+
+	EphyLocationActionPrivate *priv;
 };
 
 struct _EphyLocationActionClass
@@ -45,9 +50,14 @@ struct _EphyLocationActionClass
 	void (*go_location) (EphyLocationAction *action, char *location);
 };
 
-GType      ephy_location_action_get_type   (void);
+GType		ephy_location_action_get_type		(void);
+
+const char     *ephy_location_action_get_address	(EphyLocationAction *action);
+
+void		ephy_location_action_set_address	(EphyLocationAction *action,
+							 const char *address);
 
-GtkWidget *ephy_location_action_get_widget (EphyLocationAction *action);
+void		ephy_location_action_clear_history	(EphyLocationAction *action);
 
 G_END_DECLS