Mailbox info fix

["Matthew Guenther" <mguenthe netcom ca>]

Hi,

This should fix bugs #8047 and #8096, I can't really tell as it has always
worked for me, but now it still works (but safer).

MBG

-- 
 Matthew Guenther                   There is no time like the present for
 mguenthe@netcom.ca                 postponing what you ought to be doing.
 http://www.netcom.ca/~mguenthe/
=== cd /home/mguenthe/src/balsa/
=== cvs diff -u ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/balsa/ChangeLog,v
retrieving revision 1.179
diff -u -u -r1.179 ChangeLog
--- ChangeLog	2000/04/07 19:55:28	1.179
+++ ChangeLog	2000/04/07 23:48:34
@@ -1,3 +1,7 @@
+2000-04-07  Matthew Guenther <mguenther@netcom.ca>
+	* src/balsa-mblist.c (balsa_mblist_insert_mailbox): Fixed bug with 
+	mailbox info.
+
 2000-04-07  Peter Williams  <peter@beta.newton.cx>
 
 	* libbalsa/misc.c (wrap_string): Aborting when
=== Exit status: 1
=== cd /home/mguenthe/src/balsa/src/
=== cvs diff -u balsa-mblist.c

Index: balsa-mblist.c
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-mblist.c,v
retrieving revision 1.49
diff -u -u -r1.49 balsa-mblist.c
--- balsa-mblist.c	2000/04/04 08:59:51	1.49
+++ balsa-mblist.c	2000/04/07 23:42:28
@@ -305,11 +305,19 @@
 {
   GtkCTreeNode *ctnode;
   MailboxNode *mbnode;
-  gchar *text[1];
+#ifdef BALSA_SHOW_INFO
+  gchar* text[3];
+#else
+  gchar* text[1];
+#endif /* BALSA_SHOW_INFO */
   
   g_assert(mailbox!=NULL);
   text[0] = mailbox->name;
-
+#ifdef BALSA_SHOW_INFO
+  text[1] = "";
+  text[2] = "";
+#endif
+      
 #ifdef BALSA_SHOW_INFO
   if (mblist->display_content_info)
   {
@@ -327,12 +335,6 @@
   gtk_ctree_node_set_row_data_full (GTK_CTREE (mblist), ctnode, mbnode,
 				    (GtkDestroyNotify)mailbox_node_destroy);
 
-#ifdef BALSA_SHOW_INFO
-  if (mblist->display_content_info){
-    gtk_ctree_node_set_text (GTK_CTREE (mblist), ctnode, 1, "");
-    gtk_ctree_node_set_text (GTK_CTREE (mblist), ctnode, 2, "");
-  }
-#endif
 }
 
 /* balsa_mblist_redraw 
@@ -739,12 +741,13 @@
   /* If it's not local the mail-check function won't work, and if it's
    * already open we can get conflicting results since we're checking
    * the file on disk as opposed to the mailbox in memory */
-  if (BALSA_IS_MAILBOX_LOCAL (mailbox) && mailbox->open_ref == 0)
+  if (BALSA_IS_MAILBOX_LOCAL (mailbox) && mailbox->open_ref == 0) {
   /* Call the actual function to determine the presence of new unread
    * messages */
      mailbox->has_unread_messages = 
-	mailbox_have_new_messages (MAILBOX_LOCAL (mailbox)->path);
-
+             mailbox_have_new_messages (MAILBOX_LOCAL (mailbox)->path);
+  } 
+  
   balsa_mblist_mailbox_style (ctree, node, cnode_data
 #ifdef BALSA_SHOW_INFO
                               ,BALSA_MBLIST (ctree)->display_content_info
=== Exit status: 1

PGP signature