diff options
author | jacob berkman <jacob@ximian.com> | 2001-08-10 05:16:13 +0800 |
---|---|---|
committer | Jacob Berkman <jberkman@src.gnome.org> | 2001-08-10 05:16:13 +0800 |
commit | 0c1a805875c0db4f8e031a26334fec567029dcb5 (patch) | |
tree | 79fad2c7b98768566e8a9cc6a905f6de29de5cb8 /widgets/text/e-entry.c | |
parent | 97e76a8703a1977143c5a0b19f5ad52021769575 (diff) | |
download | gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.tar gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.tar.gz gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.tar.bz2 gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.tar.lz gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.tar.xz gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.tar.zst gsoc2013-evolution-0c1a805875c0db4f8e031a26334fec567029dcb5.zip |
bumped up to 0.10.99.3
2001-08-09 jacob berkman <jacob@ximian.com>
* configure.in: bumped up to 0.10.99.3
* gal/e-text/e-completion-view.c (e_completion_view_init): init
matches array
(e_completion_view_destroy): free matches array
(e_completion_view_disconnect): disconnect from the clear and
lost_match signals
(e_completion_view_clear_choices): fixup for ptr array
(e_completion_view_set_cursor_row): ditto
(e_completion_view_select): ditto
(e_completion_view_key_press_handler): ditto
(clear_completion_cb): handle the clear signal
(lost_completion_cb): remove a row from the model
(table_row_count): fixup for ptr array
(table_value_at): ditto
(e_completion_view_construct): connect to clear and lost
completion signals
(e_completion_view_set_width): ptr array fixup again
* gal/e-text/e-completion.c (e_completion_class_init): add new
clean / lost completion signals
(e_completion_init): initialize the matches array
(e_completion_destroy): free the matches array
(e_completion_add_match): fixup for matches being a GPtrArray
(e_completion_clear_matches): ditto
(e_completion_clear): new function to clear the list of matches
(e_completion_foreach_match): fixup for ptrarray
(e_completion_restart): ditto
(e_completion_found_match): if we are at the limit return first,
rather than adding and then unreffing. there very well could be
some weird crashes this caused but it is kind of unlikely.
(e_completion_lost_match): new function to forget about a match
(e_completion_end_search): add a comment on why this is broken
* gal/e-text/e-entry.c (e_entry_text_keypress): only start a
delayed completion if our completion timeout is >= 0. this
provides a way for the completion starting / stopping to be
controlled by something other than the EEntry (ie, file-sel)
svn path=/trunk/; revision=11843
Diffstat (limited to 'widgets/text/e-entry.c')
-rw-r--r-- | widgets/text/e-entry.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index b47e6c8ddd..120db13637 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -211,10 +211,13 @@ e_entry_text_keypress (EText *text, guint keyval, guint state, EEntry *entry) if (e_entry_is_empty (entry)) { e_entry_cancel_delayed_completion (entry); e_entry_show_popup (entry, FALSE); - } else if (entry->priv->popup_is_visible) { - e_entry_start_delayed_completion (entry, 1); - } else if (entry->priv->completion) - e_entry_start_delayed_completion (entry, entry->priv->completion_delay); + } else if (entry->priv->completion_delay >= 0) { + int delay; + delay = entry->priv->popup_is_visible + ? 1 + : entry->priv->completion_delay; + e_entry_start_delayed_completion (entry, delay); + } } entry->priv->changed_since_keypress = FALSE; } @@ -612,7 +615,7 @@ full_cb (ECompletionView *view, gpointer user_data) { EEntry *entry = E_ENTRY (user_data); - e_entry_show_popup (entry, view->choice_count > 0); + e_entry_show_popup (entry, view->choices->len > 0); } static void |