mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-16 18:25:11 -06:00
[import-main-matcher] setup_entry handles NULL and empty initial
gtk_entry_set_text throws a warning if initial is empty. Avoid calling when initial==NULL. Also, if the imported transaction has empty-string desc/notes/memo, we don't want to populate the GtkEntryCompletion with it.
This commit is contained in:
parent
3e4a4dbfe1
commit
788c3ee617
@ -1020,14 +1020,17 @@ setup_entry (GtkWidget *entry, gboolean sensitive, GHashTable *hash,
|
||||
GtkEntryCompletion* completion;
|
||||
GtkListStore *list;
|
||||
|
||||
gtk_entry_set_text (GTK_ENTRY (entry), sensitive ? initial : _("Disabled"));
|
||||
if (!sensitive)
|
||||
gtk_entry_set_text (GTK_ENTRY (entry), _("Disabled"));
|
||||
else if (initial && *initial)
|
||||
gtk_entry_set_text (GTK_ENTRY (entry), initial);
|
||||
gtk_widget_set_sensitive (entry, sensitive);
|
||||
if (!sensitive)
|
||||
return;
|
||||
|
||||
list = gtk_list_store_new (NUM_COMPLETION_COLS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
|
||||
g_hash_table_foreach (hash, (GHFunc)populate_list, list);
|
||||
if (initial && !g_hash_table_lookup (hash, (gpointer)initial))
|
||||
if (initial && *initial && !g_hash_table_lookup (hash, (gpointer)initial))
|
||||
populate_list ((gpointer)initial, NULL, list);
|
||||
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list),
|
||||
COMPLETION_LIST_ORIGINAL,
|
||||
|
Loading…
Reference in New Issue
Block a user