aboutsummaryrefslogtreecommitdiffstats
path: root/lib/widgets
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-09-12 03:18:56 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-09-12 03:18:56 +0800
commit9345135208e277113cc014c355b2360e0689d51b (patch)
tree19831b232c25b81a6c2090fd01ab6fff5905e066 /lib/widgets
parent3054db7013ad240d4231120e8135a6be6ca91539 (diff)
downloadgsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.tar
gsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.tar.gz
gsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.tar.bz2
gsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.tar.lz
gsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.tar.xz
gsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.tar.zst
gsoc2013-epiphany-9345135208e277113cc014c355b2360e0689d51b.zip
Make sure to remove show_timeout also when the window is still not
2003-09-11 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.
Diffstat (limited to 'lib/widgets')
-rw-r--r--lib/widgets/ephy-location-entry.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 3c1c6ce52..0f2fb663b 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -49,7 +49,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;
@@ -386,6 +385,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
@@ -462,12 +469,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);
@@ -711,12 +712,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