From 45799945c19414094a767dbe3d8dd0815f555014 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Tue, 16 Sep 2003 19:08:27 +0000 Subject: Make sure to remove show_timeout also when the window is still not 2003-09-16 Marco Pesenti Gritti * lib/widgets/ephy-location-entry.c: (ephy_location_entry_autocompletion_hide_alternatives), (insert_text_cb), (ephy_location_entry_autocompletion_window_hidden_cb): Make sure to remove show_timeout also when the window is still not visible. --- ChangeLog | 10 ++++++++++ lib/widgets/ephy-location-entry.c | 21 ++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 020f0a73a..f00b0bf08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-09-16 Marco Pesenti Gritti + + * lib/widgets/ephy-location-entry.c: + (ephy_location_entry_autocompletion_hide_alternatives), + (insert_text_cb), + (ephy_location_entry_autocompletion_window_hidden_cb): + + Make sure to remove show_timeout also when + the window is still not visible. + 2003-09-16 Christopher James Lahey * src/epiphany.in: Added MOZ_PLUGIN_PATH default. diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index f13c87e88..78cbc94a7 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -44,7 +44,6 @@ struct _EphyLocationEntryPrivate { EphyAutocompletion *autocompletion; EphyAutocompletionWindow *autocompletion_window; gboolean autocompletion_window_visible; - gint autocompletion_timeout; gint show_alternatives_timeout; gboolean block_set_autocompletion_key; gboolean going_to_site; @@ -379,6 +378,14 @@ ephy_location_entry_autocompletion_hide_alternatives (EphyLocationEntry *w) ephy_autocompletion_window_hide (p->autocompletion_window); p->autocompletion_window_visible = FALSE; } + + p->autocompletion_window_visible = FALSE; + + if (p->show_alternatives_timeout) + { + g_source_remove (p->show_alternatives_timeout); + p->show_alternatives_timeout = 0; + } } static void @@ -455,12 +462,6 @@ insert_text_cb (GtkWidget *editable, if (p->going_to_site) return; - if (p->autocompletion_timeout != 0) - { - g_source_remove (p->autocompletion_timeout); - p->autocompletion_timeout = 0; - } - if (p->show_alternatives_timeout != 0) { g_source_remove (p->show_alternatives_timeout); @@ -704,12 +705,6 @@ ephy_location_entry_autocompletion_window_hidden_cb (EphyAutocompletionWindow *a g_source_remove (p->show_alternatives_timeout); p->show_alternatives_timeout = 0; } - - if (p->autocompletion_timeout) - { - g_source_remove (p->autocompletion_timeout); - p->autocompletion_timeout = 0; - } } void -- cgit v1.2.3