diff --git a/src/engine/Account.c b/src/engine/Account.c index b090ecd0a6..c3c5ca805b 100644 --- a/src/engine/Account.c +++ b/src/engine/Account.c @@ -5493,7 +5493,7 @@ build_bayes_layer_two (const char *key, const GValue *value, gpointer user_data) QofBook *book; Account *root; gchar *kvp_path; - gchar *probability; + gchar *count; struct kvp_info *kvpInfo_node; @@ -5506,7 +5506,7 @@ build_bayes_layer_two (const char *key, const GValue *value, gpointer user_data) PINFO("build_bayes_layer_two: account '%s', token_count: '%" G_GINT64_FORMAT "'", (char*)key, g_value_get_int64(value)); - probability = g_strdup_printf ("%" G_GINT64_FORMAT, g_value_get_int64 (value)); + count = g_strdup_printf ("%" G_GINT64_FORMAT, g_value_get_int64 (value)); kvp_path = g_strconcat (kvpInfo->kvp_path_head, "/", key, NULL); @@ -5519,12 +5519,12 @@ build_bayes_layer_two (const char *key, const GValue *value, gpointer user_data) kvpInfo_node->kvp_path = g_strdup (kvp_path); kvpInfo_node->match_string = g_strdup (kvpInfo->match_string); kvpInfo_node->kvp_path_head = g_strdup (kvpInfo->kvp_path_head); - kvpInfo_node->probability = g_strdup (probability); + kvpInfo_node->count = g_strdup (count); kvpInfo->list = g_list_append (kvpInfo->list, kvpInfo_node); g_free (kvp_path); - g_free (probability); + g_free (count); } static void @@ -5595,7 +5595,7 @@ build_non_bayes (const char *key, const GValue *value, gpointer user_data) kvpInfo_node->kvp_path = g_strdup (kvp_path); kvpInfo_node->match_string = g_strdup (key); kvpInfo_node->kvp_path_head = g_strdup (kvpInfo->kvp_path_head); - kvpInfo_node->probability = g_strdup (" "); + kvpInfo_node->count = g_strdup (" "); kvpInfo->list = g_list_append (kvpInfo->list, kvpInfo_node); diff --git a/src/engine/Account.h b/src/engine/Account.h index 85c92f5282..78dab44e8e 100644 --- a/src/engine/Account.h +++ b/src/engine/Account.h @@ -1414,7 +1414,7 @@ struct kvp_info char *kvp_path_head; char *kvp_path; char *match_string; - char *probability; + char *count; }; /** Returns a GList of structure kvp_info of all Bayesian mappings for diff --git a/src/gnome/dialog-imap-editor.c b/src/gnome/dialog-imap-editor.c index 2d8ce41503..293bcb510d 100644 --- a/src/gnome/dialog-imap-editor.c +++ b/src/gnome/dialog-imap-editor.c @@ -46,7 +46,7 @@ /** Enumeration for the liststore */ enum GncImapColumn {SOURCE_FULL_ACC, SOURCE_ACCOUNT, BASED_ON, MATCH_STRING, - MAP_FULL_ACC, MAP_ACCOUNT, KVP_PATH, PROBABILITY}; + MAP_FULL_ACC, MAP_ACCOUNT, KVP_PATH, COUNT}; typedef enum { @@ -248,17 +248,19 @@ list_type_selected (GtkToggleButton* button, ImapDialog *imap_dialog) } static void -show_probability_column (ImapDialog *imap_dialog, gboolean show) +show_count_column (ImapDialog *imap_dialog, gboolean show) { GtkTreeViewColumn *tree_column; - // Show Probability Column + // Show Count Column tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW(imap_dialog->view), 4); gtk_tree_view_column_set_visible (tree_column, show); // Hide Based on Column tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW(imap_dialog->view), 1); gtk_tree_view_column_set_visible (tree_column, !show); + + gtk_tree_view_columns_autosize (GTK_TREE_VIEW(imap_dialog->view)); } static void @@ -283,7 +285,7 @@ add_to_store (GtkTreeModel *store, const gchar *text, gpointer user_data) BASED_ON, text, MATCH_STRING, kvpInfo->match_string, MAP_FULL_ACC, map_fullname, MAP_ACCOUNT, kvpInfo->map_account, - KVP_PATH, kvpInfo->kvp_path, PROBABILITY, kvpInfo->probability, -1); + KVP_PATH, kvpInfo->kvp_path, COUNT, kvpInfo->count, -1); g_free (fullname); g_free (map_fullname); @@ -321,7 +323,7 @@ get_imap_info (Account *acc, const gchar *category, GtkTreeModel *store, const g g_free (kvpInfo->kvp_path_head); g_free (kvpInfo->kvp_path); g_free (kvpInfo->match_string); - g_free (kvpInfo->probability); + g_free (kvpInfo->count); g_free (kvpInfo); } } @@ -347,8 +349,8 @@ get_account_info (ImapDialog *imap_dialog) store = gtk_tree_view_get_model (GTK_TREE_VIEW(imap_dialog->view)); gtk_list_store_clear (GTK_LIST_STORE(store)); - // Hide Probability Column - show_probability_column (imap_dialog, FALSE); + // Hide Count Column + show_count_column (imap_dialog, FALSE); /* Go through list of accounts */ for (ptr = accts; ptr; ptr = g_list_next (ptr)) @@ -362,8 +364,8 @@ get_account_info (ImapDialog *imap_dialog) { get_imap_info (acc, NULL, store, _("Bayesian")); - // Show Probability Column - show_probability_column (imap_dialog, TRUE); + // Show Count Column + show_count_column (imap_dialog, TRUE); } if (imap_dialog->type == NBAYES) @@ -394,7 +396,7 @@ get_account_info (ImapDialog *imap_dialog) kvpInfo.map_account = kvpInfo.source_account; kvpInfo.match_string = text; - kvpInfo.probability = " "; + kvpInfo.count = " "; // Add kvp data to store add_to_store (store, _("Online Id"), &kvpInfo); diff --git a/src/gnome/gtkbuilder/dialog-imap-editor.glade b/src/gnome/gtkbuilder/dialog-imap-editor.glade index 5547c2b559..be54802196 100644 --- a/src/gnome/gtkbuilder/dialog-imap-editor.glade +++ b/src/gnome/gtkbuilder/dialog-imap-editor.glade @@ -16,9 +16,9 @@ - + - + @@ -208,9 +208,9 @@ - + True - Probability Value + Count of Match String Usage