aboutsummaryrefslogtreecommitdiffstats
path: root/lib/widgets/ephy-location-entry.h
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-07-26 22:41:39 +0800
committerChristian Persch <chpe@src.gnome.org>2005-07-26 22:41:39 +0800
commit8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a (patch)
treeb9772afea471786562765f12883c8478381ae08a /lib/widgets/ephy-location-entry.h
parentd893c0a52260d98b475bafada38273643342d2ee (diff)
downloadgsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.tar
gsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.tar.gz
gsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.tar.bz2
gsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.tar.lz
gsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.tar.xz
gsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.tar.zst
gsoc2013-epiphany-8d4fdd9a0f51f292db61ecfbdfc7d1b617adaf7a.zip
Fix ESC behaviour to always stop, and to reset the location entry when
2005-07-24 Christian Persch <chpe@cvs.gnome.org> * data/ui/epiphany-ui.xml: * lib/widgets/ephy-location-entry.c: (ephy_location_entry_finalize), (update_address_state), (update_favicon), (editable_changed_cb), (entry_button_press_cb), (match_selected_cb), (entry_key_press_cb), (ephy_location_entry_construct_contents), (ephy_location_entry_set_location), (ephy_location_entry_reset), (ephy_location_entry_set_favicon): * lib/widgets/ephy-location-entry.h: * src/ephy-location-action.c: (entry_activate_cb), (user_changed_cb), (sync_address), (connect_proxy), (ephy_location_action_set_property), (ephy_location_action_finalize), (ephy_location_action_set_address): * src/ephy-location-action.h: * src/ephy-lockdown.c: (update_location_editable): * src/ephy-tab.c: (ephy_tab_get_typed_address): * src/ephy-toolbar.c: (ephy_toolbar_set_location): * src/ephy-toolbar.h: * src/ephy-window.c: (ephy_window_key_press_event), (sync_tab_address), (ephy_window_set_active_tab), (modal_alert_cb): * src/epiphany.defs: * src/window-commands.c: (window_cmd_view_stop): Fix ESC behaviour to always stop, and to reset the location entry when it's focused only. Reset the location entry favicon to the stock icon when the address shown is != the tab's address. When switching tab, preserve the selection if it was owned by the location entry. Fixes bug #155824.
Diffstat (limited to 'lib/widgets/ephy-location-entry.h')
-rw-r--r--lib/widgets/ephy-location-entry.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 1373a5ba2..7838abd93 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -47,11 +47,11 @@ struct _EphyLocationEntryClass
GtkToolItemClass parent_class;
/* Signals */
- void (*user_changed) (EphyLocationEntry *entry);
- void (* lock_clicked) (EphyLocationEntry *entry);
+ void (* user_changed) (EphyLocationEntry *entry);
+ void (* lock_clicked) (EphyLocationEntry *entry);
/* for getting the drag data */
- char * (* get_location) (EphyLocationEntry *entry);
- char * (* get_title) (EphyLocationEntry *entry);
+ char * (* get_location) (EphyLocationEntry *entry);
+ char * (* get_title) (EphyLocationEntry *entry);
};
struct _EphyLocationEntry
@@ -74,11 +74,12 @@ void ephy_location_entry_set_completion (EphyLocationEntry *le,
guint relevance_col);
void ephy_location_entry_set_location (EphyLocationEntry *le,
- const char *new_location);
+ const char *address,
+ const char *typed_address);
const char *ephy_location_entry_get_location (EphyLocationEntry *le);
-void ephy_location_entry_restore_location (EphyLocationEntry *le);
+gboolean ephy_location_entry_reset (EphyLocationEntry *entry);
void ephy_location_entry_activate (EphyLocationEntry *le);