one more

[Ragnar Henriksen <henrag online no>]

Hello again,

I've done one more minor change that I would like to share.

I made it optional to view the "checked" box when you check for mail. (Settings->preferences->Misc->showcheakbox).

regards,
Ragnar.


Only in balsa-latest/src/: Makefile
diff -ru balsa-0.4.9.5/src/Makefile.in balsa-latest/src/Makefile.in
--- balsa-0.4.9.5/src/Makefile.in	Tue Apr 20 12:45:54 1999
+++ balsa-latest/src/Makefile.in	Mon Jun 21 09:06:35 1999
@@ -127,7 +127,7 @@
 
 bin_PROGRAMS = balsa
 
-balsa_SOURCES =  	balsa-app.c			balsa-icons.c			balsa-index.c			balsa-init.c			balsa-mblist.c			balsa-message.c			filter-edit-callbacks.c		filter-edit-dialog.c		index-child.c			local-mailbox.c			mailbox-conf.c			main-window.c			main.c				message-window.c		pref-manager.c			save-restore.c			sendmsg-window.c		balsa-app.h			balsa-icons.h			balsa-index.h			balsa-mblist.h			balsa-init.h			balsa-message.h			filter-edit.h			index-child.h			local-mailbox.h			mailbox-conf.h			main-window.h			main.h				message-window.h		pref-manager.h			save-restore.h			sendmsg-window.h		mblist-window.c			mblist-window.h
+balsa_SOURCES =  address-book.c	balsa-app.c			balsa-icons.c			balsa-index.c			balsa-init.c			balsa-mblist.c			balsa-message.c			filter-edit-callbacks.c		filter-edit-dialog.c		index-child.c			local-mailbox.c			mailbox-conf.c			main-window.c			main.c				message-window.c		pref-manager.c			save-restore.c			sendmsg-window.c		balsa-app.h			balsa-icons.h			balsa-index.h			balsa-mblist.h			balsa-init.h			balsa-message.h			filter-edit.h			index-child.h			local-mailbox.h			mailbox-conf.h			main-window.h			main.h				message-window.h		pref-manager.h			save-restore.h			sendmsg-window.h		mblist-window.c			mblist-window.h
 
 
 INCLUDES =  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I.							-I${top_srcdir}/libbalsa				-I${top_srcdir}						-I$(top_srcdir)/idl					-I$(top_builddir)/idl					-I${top_builddir}/libmutt				 $(GNOME_INCLUDEDIR)
@@ -143,7 +143,7 @@
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 LIBS = @LIBS@
-balsa_OBJECTS =  balsa-app.o balsa-icons.o balsa-index.o balsa-init.o \
+balsa_OBJECTS =  address-book.o balsa-app.o balsa-icons.o balsa-index.o balsa-init.o \
 balsa-mblist.o balsa-message.o filter-edit-callbacks.o \
 filter-edit-dialog.o index-child.o local-mailbox.o mailbox-conf.o \
 main-window.o main.o message-window.o pref-manager.o save-restore.o \

diff -ru balsa-0.4.9.5/src/balsa-app.c balsa-latest/src/balsa-app.c
--- balsa-0.4.9.5/src/balsa-app.c	Wed Jun 23 12:55:29 1999
+++ balsa-latest/src/balsa-app.c	Wed Jun 23 09:47:58 1999
@@ -112,6 +112,7 @@
   balsa_app.new_messages = 0;
 
   balsa_app.check_mail_timer = 0;
+  balsa_app.checkbox = FALSE;
 
   balsa_app.debug = FALSE;
   balsa_app.previewpane = TRUE;
diff -ru balsa-0.4.9.5/src/balsa-app.h balsa-latest/src/balsa-app.h
--- balsa-0.4.9.5/src/balsa-app.h	Wed Jun 23 12:55:29 1999
+++ balsa-latest/src/balsa-app.h	Wed Jun 23 09:47:31 1999
@@ -103,7 +103,8 @@
   gint encoding_style;
   gchar *charset;
 
-      
+  gint checkbox;
+
 }
 balsa_app;
 
diff -ru balsa-0.4.9.5/src/main-window.c balsa-latest/src/main-window.c
--- balsa-0.4.9.5/src/main-window.c	Wed Jun 23 12:55:29 1999
+++ balsa-latest/src/main-window.c	Wed Jun 23 09:46:56 1999
@@ -461,13 +461,15 @@
 {
   GtkWidget *dialog, *w;
 
-  dialog = gnome_dialog_new("Checking Mail...", GNOME_STOCK_BUTTON_OK, NULL);
-  gnome_dialog_set_close(GNOME_DIALOG(dialog), TRUE);
+  if (balsa_app.checkbox) {
+      dialog = gnome_dialog_new("Checking Mail...", GNOME_STOCK_BUTTON_OK, NULL);
+      gnome_dialog_set_close(GNOME_DIALOG(dialog), TRUE);
 
-  w = gtk_label_new("Checking Mail....");
-  gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), w, FALSE, FALSE, 0);
+      w = gtk_label_new("Checking Mail....");
+      gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dialog)->vbox), w, FALSE, FALSE, 0);
 
-  gtk_widget_show_all(dialog);
+      gtk_widget_show_all(dialog);
+  }
 
   check_all_pop3_hosts (balsa_app.inbox, balsa_app.inbox_input);
   check_all_imap_hosts (balsa_app.inbox, balsa_app.inbox_input);
@@ -475,7 +477,9 @@
   if (balsa_app.current_index_child != NULL)
     mailbox_check_new_messages (BALSA_INDEX (balsa_app.current_index_child->index)->mailbox);
 
-  gtk_label_set_text(GTK_LABEL(w), N_("Checked."));
+  if (balsa_app.checkbox)
+      gtk_label_set_text(GTK_LABEL(w), N_("Checked."));
+
 //  gtk_widget_destroy(dialog);
 }
 
diff -ru balsa-0.4.9.5/src/pref-manager.c balsa-latest/src/pref-manager.c
--- balsa-0.4.9.5/src/pref-manager.c	Wed Jun 23 12:55:29 1999
+++ balsa-latest/src/pref-manager.c	Wed Jun 23 11:13:42 1999
@@ -43,6 +43,7 @@
 
     GtkWidget *previewpane;
     GtkWidget *debug;		/* enable/disable debugging */
+    GtkWidget *checkbox;
 
 #ifdef BALSA_SHOW_INFO
     GtkWidget *mblist_show_mb_content_info;
@@ -101,7 +102,6 @@
 static GtkWidget *create_misc_page (void);
 static GtkWidget *create_encoding_page (void);
 
-
 /* save the settings */
 static void apply_prefs (GnomePropertyBox * pbox, gint page, PropertyUI * pui);
 
@@ -189,12 +189,13 @@
 			     create_misc_page (),
 			     label);
 
-  /* Misc page */
+  /* Encoding page */
   label = gtk_label_new (_ ("Encoding"));
   gtk_notebook_append_page (
 		    GTK_NOTEBOOK (GNOME_PROPERTY_BOX (pui->pbox)->notebook),
 			     create_encoding_page (),
 			     label);
+
   set_prefs ();
   for (i = 0; i < NUM_TOOLBAR_MODES; i++)
     {
@@ -204,6 +205,8 @@
 
   gtk_signal_connect (GTK_OBJECT (pui->previewpane), "toggled",
 		      GTK_SIGNAL_FUNC (properties_modified_cb), pui->pbox);
+  gtk_signal_connect (GTK_OBJECT (pui->checkbox), "toggled",
+		      GTK_SIGNAL_FUNC (properties_modified_cb), pui->pbox);
   gtk_signal_connect (GTK_OBJECT (pui->debug), "toggled",
 		      GTK_SIGNAL_FUNC (properties_modified_cb), pui->pbox);
 #ifdef BALSA_SHOW_INFO
@@ -304,7 +307,9 @@
 	balsa_app.toolbar_style = toolbar_type[i];
 	break;
       }
-  balsa_app.debug = GTK_TOGGLE_BUTTON (pui->debug)->active;
+  balsa_app.debug =    GTK_TOGGLE_BUTTON (pui->debug)->active;
+  balsa_app.checkbox = GTK_TOGGLE_BUTTON(pui->checkbox)->active;
+
   balsa_app.previewpane = GTK_TOGGLE_BUTTON (pui->previewpane)->active;
 #ifdef BALSA_SHOW_INFO
   if (balsa_app.mblist_show_mb_content_info != GTK_TOGGLE_BUTTON (pui->mblist_show_mb_content_info)->active)
@@ -371,6 +376,7 @@
   gtk_entry_set_text (GTK_ENTRY (pui->mail_directory), balsa_app.local_mail_directory);
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pui->previewpane), balsa_app.previewpane);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pui->checkbox), balsa_app.checkbox);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pui->debug), balsa_app.debug);
 #ifdef BALSA_SHOW_INFO
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pui->mblist_show_mb_content_info), balsa_app.mblist_show_mb_content_info);
@@ -689,6 +695,8 @@
   pui->debug = gtk_check_button_new_with_label (_("Debug"));
   gtk_box_pack_start (GTK_BOX (vbox1), GTK_WIDGET (pui->debug), TRUE, TRUE, 2);
 
+  pui->checkbox = gtk_check_button_new_with_label(_("Show check box?"));
+  gtk_box_pack_start (GTK_BOX (vbox1), GTK_WIDGET (pui->checkbox), TRUE, TRUE, 2);
 
   /* arp --- table containing leadin label and string. */
   table = gtk_table_new (1, 2, FALSE);

diff -ru balsa-0.4.9.5/src/save-restore.c balsa-latest/src/save-restore.c
--- balsa-0.4.9.5/src/save-restore.c	Wed Jun 23 12:55:29 1999
+++ balsa-latest/src/save-restore.c	Wed Jun 23 09:57:53 1999
@@ -720,6 +720,11 @@
   else
       balsa_app.encoding_style = atoi(field);
 
+  if (( field = pl_dict_get_str(globals, "CheckBox")) == NULL)
+      balsa_app.checkbox = TRUE;
+  else
+      balsa_app.encoding_style = atoi(field);
+
   return TRUE;
 }				/* config_global_load */
 
@@ -786,6 +791,10 @@
 
     snprintf (tmp, sizeof (tmp), "%d", balsa_app.encoding_style);
     pl_dict_add_str_str (globals, "EncodingStyle", tmp);
+
+    snprintf (tmp, sizeof (tmp), "%d", balsa_app.checkbox);
+    pl_dict_add_str_str (globals, "CheckBox", tmp);
+
   }