[balsa] mailbox-node: Do not give access to :scanned



commit b453597e01ef8a02a7eb90d2912f48cd9994beac
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jul 27 15:29:52 2019 -0400

    mailbox-node: Do not give access to :scanned
    
    Do not give access to BalsaMailboxNode:scanned
    
    We can do all the checking in mailbox-node.c.
    
    * src/mailbox-node.c (balsa_mailbox_node_append_subtree): check
      whether the mbnode has been scanned;
    * src/mailbox-node.h: drop accessors;
    * src/balsa-mblist.c (balsa_mblist_mailbox_node_append): no need
      to check whether the mbnode has been scanned.

 ChangeLog          | 12 ++++++++++++
 src/balsa-mblist.c |  4 +---
 src/mailbox-node.c | 35 +++++++++--------------------------
 src/mailbox-node.h |  2 --
 4 files changed, 22 insertions(+), 31 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 59132d64c..4a24466c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-07-27  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       mailbox-node: Do not give access to BalsaMailboxNode:scanned
+
+       We can do all the checking in mailbox-node.c.
+
+       * src/mailbox-node.c (balsa_mailbox_node_append_subtree): check
+       whether the mbnode has been scanned;
+       * src/mailbox-node.h: drop accessors;
+       * src/balsa-mblist.c (balsa_mblist_mailbox_node_append): no need
+       to check whether the mbnode has been scanned.
+
 2019-07-26  Peter Bloomfield  <pbloomfield bellsouth net>
 
        balsa-mailbox-node: Use modern macros to declare and define.
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index cfbf3e05d..86ca8a8c7 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -2277,11 +2277,9 @@ balsa_mblist_mailbox_node_append(BalsaMailboxNode * root,
         GtkTreePath *parent_path =
             gtk_tree_model_get_path(model, parent_iter);
         if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(balsa_app.mblist),
-                                       parent_path)
-            && !balsa_mailbox_node_get_scanned(mbnode)) {
+                                       parent_path)) {
             /* Check this node for children. */
             balsa_mailbox_node_append_subtree(mbnode);
-            balsa_mailbox_node_set_scanned(mbnode, TRUE);
         }
         gtk_tree_path_free(parent_path);
     }
diff --git a/src/mailbox-node.c b/src/mailbox-node.c
index f28bf9a36..8e83e5f44 100644
--- a/src/mailbox-node.c
+++ b/src/mailbox-node.c
@@ -650,19 +650,20 @@ balsa_mailbox_node_new_imap_folder(LibBalsaServer* s, const char*p)
 void
 balsa_mailbox_node_show_prop_dialog(BalsaMailboxNode* mn)
 {
-    if (mn)
-        g_signal_emit(G_OBJECT(mn),
-                      balsa_mailbox_node_signals[SHOW_PROP_DIALOG], 0);
+    if (mn != NULL)
+        g_signal_emit(mn, balsa_mailbox_node_signals[SHOW_PROP_DIALOG], 0);
 }
 
 void
 balsa_mailbox_node_append_subtree(BalsaMailboxNode * mn)
 {
-    g_signal_emit(G_OBJECT(mn),
-                 balsa_mailbox_node_signals[APPEND_SUBTREE], 0);
+    if (!mn->scanned) {
+        g_signal_emit(mn, balsa_mailbox_node_signals[APPEND_SUBTREE], 0);
+        mn->scanned = TRUE;
+    }
 }
 
-void 
+void
 balsa_mailbox_node_show_prop_dialog_cb(GtkWidget * widget, gpointer data)
 {
     balsa_mailbox_node_show_prop_dialog((BalsaMailboxNode*)data);
@@ -675,15 +676,13 @@ balsa_mailbox_node_show_prop_dialog_cb(GtkWidget * widget, gpointer data)
 void
 balsa_mailbox_node_load_config(BalsaMailboxNode* mn, const gchar* group)
 {
-    g_signal_emit(G_OBJECT(mn),
-                 balsa_mailbox_node_signals[LOAD_CONFIG], 0, group);
+    g_signal_emit(mn, balsa_mailbox_node_signals[LOAD_CONFIG], 0, group);
 }
 
 void
 balsa_mailbox_node_save_config(BalsaMailboxNode* mn, const gchar* group)
 {
-    g_signal_emit(G_OBJECT(mn),
-                 balsa_mailbox_node_signals[SAVE_CONFIG], 0, group);
+    g_signal_emit(mn, balsa_mailbox_node_signals[SAVE_CONFIG], 0, group);
 }
 
 /* ---------------------------------------------------------------------
@@ -1482,14 +1481,6 @@ balsa_mailbox_node_set_subscribed(BalsaMailboxNode * mbnode, guint subscribed)
     mbnode->subscribed = !!subscribed;
 }
 
-void
-balsa_mailbox_node_set_scanned(BalsaMailboxNode * mbnode, guint scanned)
-{
-    g_return_if_fail(BALSA_IS_MAILBOX_NODE(mbnode));
-
-    mbnode->scanned = !!scanned;
-}
-
 /*
  * Getters
  */
@@ -1550,14 +1541,6 @@ balsa_mailbox_node_get_subscribed(BalsaMailboxNode * mbnode)
     return mbnode->subscribed;
 }
 
-guint
-balsa_mailbox_node_get_scanned(BalsaMailboxNode * mbnode)
-{
-    g_return_val_if_fail(BALSA_IS_MAILBOX_NODE(mbnode), FALSE);
-
-    return mbnode->scanned;
-}
-
 guint
 balsa_mailbox_node_get_list_inbox(BalsaMailboxNode * mbnode)
 {
diff --git a/src/mailbox-node.h b/src/mailbox-node.h
index 0385d0fc7..58f2c3eae 100644
--- a/src/mailbox-node.h
+++ b/src/mailbox-node.h
@@ -88,7 +88,6 @@ void balsa_mailbox_node_change_style(BalsaMailboxNode * mbnode,
                                      BalsaMailboxNodeStyle set,
                                      BalsaMailboxNodeStyle clear);
 void balsa_mailbox_node_set_subscribed(BalsaMailboxNode * mbnode, guint subscribed);
-void balsa_mailbox_node_set_scanned(BalsaMailboxNode * mbnode, guint scanned);
 void balsa_mailbox_node_set_list_inbox(BalsaMailboxNode * mbnode, guint list_inbox);
 
 /*
@@ -103,7 +102,6 @@ const gchar * balsa_mailbox_node_get_config_prefix(BalsaMailboxNode * mbnode);
 time_t balsa_mailbox_node_get_last_use_time(BalsaMailboxNode * mbnode);
 BalsaMailboxNodeStyle balsa_mailbox_node_get_style(BalsaMailboxNode * mbnode);
 guint balsa_mailbox_node_get_subscribed(BalsaMailboxNode * mbnode);
-guint balsa_mailbox_node_get_scanned(BalsaMailboxNode * mbnode);
 guint balsa_mailbox_node_get_list_inbox(BalsaMailboxNode * mbnode);
 gint balsa_mailbox_node_get_delim(BalsaMailboxNode * mbnode);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]