diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-09-17 03:08:27 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-09-17 03:08:27 +0800 |
| commit | 45799945c19414094a767dbe3d8dd0815f555014 (patch) | |
| tree | e2fda6507058463e170b2111e193d54febcb53e4 | |
| parent | d13ecf2ee0da33a5ba4896b8c9eadb09a8db61d6 (diff) | |
| download | gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.tar gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.tar.gz gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.tar.bz2 gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.tar.lz gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.tar.xz gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.tar.zst gsoc2013-epiphany-45799945c19414094a767dbe3d8dd0815f555014.zip | |
Make sure to remove show_timeout also when the window is still not
2003-09-16 Marco Pesenti Gritti <marco@gnome.org>
* 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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | lib/widgets/ephy-location-entry.c | 21 |
2 files changed, 18 insertions, 13 deletions
@@ -1,3 +1,13 @@ +2003-09-16 Marco Pesenti Gritti <marco@gnome.org> + + * 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 <clahey@ximian.com> * 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 |