AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bilelmoussaoui/entry-completion' into 'main'

Browse Source 
entry completion: add checks that entry is set already

See merge request GNOME/gtk!4450
This commit is contained in:
Matthias Clasen 2022-02-11 17:49:26 +00:00
commit 9205193147
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkentrycompletion.c
View File

@ -1211,6 +1211,8 @@ gtk_entry_completion_match_selected (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter)
{
g_assert (completion->entry != NULL);
char *str = NULL;
gtk_tree_model_get (model, iter, completion->text_column, &str, -1);
@ -1229,6 +1231,8 @@ gtk_entry_completion_cursor_on_match (GtkEntryCompletion *completion,
GtkTreeModel *model,
GtkTreeIter *iter)
{
g_assert (completion->entry != NULL);
gtk_entry_completion_insert_completion (completion, model, iter);
return TRUE;
@ -1317,6 +1321,8 @@ static gboolean
gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
const char *prefix)
{
g_assert (completion->entry != NULL);
if (prefix)
{
int key_len;
@ -1417,6 +1423,8 @@ gtk_entry_completion_insert_completion (GtkEntryCompletion *completion,
void
gtk_entry_completion_insert_prefix (GtkEntryCompletion *completion)
{
g_return_if_fail (completion->entry != NULL);
gboolean done;
char *prefix;
GtkText *text = gtk_entry_get_text_widget (GTK_ENTRY (completion->entry));