cleanup patch

From: Eric Christopher <echristo cygnus com>
To: balsa-list gnome org
Subject: cleanup patch
Date: Mon, 03 Jan 2000 20:19:26 -0800

This is a quickie little patch that does nothing but remove code that
had been #if 0'd or commented out without any comment explaining why it
was still there.  It also adds a copyright statement to a header file
that I pulled from the accompanying C file.  Comments?

-eric

Index: balsa/libbalsa/filter-funcs.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/filter-funcs.c,v
retrieving revision 1.10
diff -u -p -r1.10 filter-funcs.c
--- balsa/libbalsa/filter-funcs.c	1998/12/18 06:48:37	1.10
+++ balsa/libbalsa/filter-funcs.c	2000/01/04 04:01:33
@@ -106,7 +106,7 @@ filter_free (filter * fil,
  *    GList *filter_list - the filter list to clear
  *
  * Returns:
- *    GList *NULL - a null value (we cleard it, eh?)
+ *    GList *NULL - a null value (we cleared it, eh?)
  */
 GList *
 filter_clear_filters (GList * filter_list)
Index: balsa/libbalsa/mailbox.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox.c,v
retrieving revision 1.109
diff -u -p -r1.109 mailbox.c
--- balsa/libbalsa/mailbox.c	1999/12/30 21:14:14	1.109
+++ balsa/libbalsa/mailbox.c	2000/01/04 04:01:42
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <stdarg.h>
 #include <ctype.h>
-/* this should be removed.  it is only used for _() for internationalzation */
+/* this is only used for _() for internationalzation */
 #include <gnome.h>
 
 #include <stdio.h>
@@ -161,7 +161,7 @@ check_all_imap_hosts (Mailbox * to, GLis
 #ifdef BALSA_USE_THREADS
 /*  Only check if lock has been set */
   pthread_mutex_lock( &mailbox_lock);
-  if( !checking_mail )
+  if( !checking_mail )	
   {
     pthread_mutex_unlock( &mailbox_lock);
     return;
@@ -201,10 +201,6 @@ check_all_pop3_hosts (Mailbox *to, GList
 #endif BALSA_USE_THREADS
 
   list = g_list_first (mailboxes);
-
- /* if (to->type != MAILBOX_MBOX)
-    return;
-  */
   
   Spoolfile = MAILBOX_LOCAL (to)->path;
 
@@ -255,7 +251,6 @@ check_all_pop3_hosts (Mailbox *to, GList
 	threadmsg = malloc( sizeof( MailThreadMessage ) );
 	threadmsg->message_type = MSGMAILTHREAD_UPDATECONFIG;
 	threadmsg->mailbox = (void *) mailbox;
-	/*  MAILBOX_POP3(mailbox)->mailbox.name */
         write( mail_thread_pipes[1], (void *) &threadmsg, sizeof(void *) );
 #else
 	config_mailbox_update( mailbox, MAILBOX_POP3(mailbox)->mailbox.name);
@@ -669,7 +664,6 @@ mailbox_check_new_messages (Mailbox * ma
     }
   else if (i == M_NEW_MAIL || i == M_REOPENED)
     {
-      // g_print ("got new mail! yippie!\n");
       mailbox->new_messages = CLIENT_CONTEXT (mailbox)->msgcount - mailbox->messages;
 
       if (mailbox->new_messages > 0)
@@ -1209,7 +1203,7 @@ mailbox_valid (gchar * filename)
 gboolean
 mailbox_gather_content_info(Mailbox *mailbox)
 {
-	/* this code is far too slow, and mut does not provide a good way to
+	/* this code is far too slow, and mutt does not provide a good way to
 	 * do this.  we will not use it for now */
 #if 0
   GList *message_list;
@@ -1262,7 +1256,6 @@ void mailbox_commit_flagged_changes( Mai
     }
 
   mailbox_open_unref (mailbox);
-  //  mx_sync_mailbox( CLIENT_CONTEXT(mailbox)  );
 }
 
 /* internal c-client translation */
Index: balsa/libbalsa/mailbox_imap.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox_imap.c,v
retrieving revision 1.1
diff -u -p -r1.1 mailbox_imap.c
--- balsa/libbalsa/mailbox_imap.c	1999/11/18 22:32:25	1.1
+++ balsa/libbalsa/mailbox_imap.c	2000/01/04 04:01:42
@@ -20,7 +20,6 @@
 #include "libbalsa.h"
 
 static MailboxClass *parent_class = NULL;
-//static guint mailbox_signals[LAST_SIGNAL] = { 0 };
 
 static void balsa_mailbox_imap_destroy (GtkObject *object);
 static void balsa_mailbox_imap_class_init (MailboxIMAPClass *klass);
Index: balsa/libbalsa/mailbox_local.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox_local.c,v
retrieving revision 1.1
diff -u -p -r1.1 mailbox_local.c
--- balsa/libbalsa/mailbox_local.c	1999/11/18 22:32:25	1.1
+++ balsa/libbalsa/mailbox_local.c	2000/01/04 04:01:42
@@ -20,7 +20,6 @@
 #include "libbalsa.h"
 
 static MailboxClass *parent_class = NULL;
-//static guint mailbox_signals[LAST_SIGNAL] = { 0 };
 
 static void balsa_mailbox_local_class_init (MailboxLocalClass *klass);
 static void balsa_mailbox_local_init(MailboxLocal *mailbox);
Index: balsa/libbalsa/mailbox_pop3.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/mailbox_pop3.c,v
retrieving revision 1.1
diff -u -p -r1.1 mailbox_pop3.c
--- balsa/libbalsa/mailbox_pop3.c	1999/11/18 22:32:25	1.1
+++ balsa/libbalsa/mailbox_pop3.c	2000/01/04 04:01:42
@@ -20,7 +20,6 @@
 #include "libbalsa.h"
 
 static MailboxClass *parent_class = NULL;
-//static guint mailbox_signals[LAST_SIGNAL] = { 0 };
 
 static void balsa_mailbox_pop3_destroy (GtkObject *object);
 static void balsa_mailbox_pop3_class_init (MailboxPOP3Class *klass);
Index: balsa/libbalsa/message.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/message.c,v
retrieving revision 1.10
diff -u -p -r1.10 message.c
--- balsa/libbalsa/message.c	1997/01/03 15:23:29	1.10
+++ balsa/libbalsa/message.c	2000/01/04 04:01:43
@@ -26,9 +26,6 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <time.h>
-#ifdef BALSA_USE_THREADS
-#include <pthread.h>
-#endif
 
 #include "mailbackend.h"
 
@@ -38,9 +35,11 @@
 #include "misc.h"
 
 #ifdef BALSA_USE_THREADS
-#include "threads.h"
+#include <pthread.h>
+#include <threads.h>
 #endif
 
+
 static void libbalsa_message_class_init (MessageClass *klass);
 static void libbalsa_message_init (Message *message);
 
@@ -510,25 +509,6 @@ message_body_ref (Message * message)
       body = body_new ();
       body->mutt_body = cur->content;
       message->body_list = g_list_append (message->body_list, body);
-#if 0
-      if (cur->content->type == TYPEMULTIPART)
-	{
-	  bdy = cur->content->parts;
-	  while (bdy)
-	    {
-#ifdef DEBUG
-	      fprintf (stderr, "h->c->type      = %s[%d]\n", mime_content_type2str (bdy->type), bdy->type);
-	      fprintf (stderr, "h->c->subtype   = %s\n", bdy->subtype);
-	      fprintf (stderr, "======\n");
-#endif
-	      body = body_new ();
-	      body->mutt_body = bdy;
-	      message->body_list = g_list_append (message->body_list, body);
-	      bdy = bdy->next;
-
-	    }
-	}
-#endif
       message->body_ref++;
       mx_close_message (&msg);
     }
Index: balsa/libbalsa/send.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/send.c,v
retrieving revision 1.44
diff -u -p -r1.44 send.c
--- balsa/libbalsa/send.c	2000/01/01 18:53:51	1.44
+++ balsa/libbalsa/send.c	2000/01/04 04:01:46
@@ -23,10 +23,6 @@
 #include <string.h>
 #include <gnome.h>
 
-#ifdef BALSA_USE_THREADS
-#include <pthread.h>
-#endif
-
 #include "../src/balsa-app.h"
 #include "mailbox.h"
 #include "misc.h"
@@ -48,6 +44,7 @@
 #include <fcntl.h>
 
 #ifdef BALSA_USE_THREADS
+#include <pthread.h>
 #include <threads.h>
 #endif
 
@@ -200,10 +197,7 @@ balsa_send_message (Message * message)
   if( sending_mail )
     {
       /* add to the queue of messages waiting to be sent */
-      //last_message->next_message = NULL;
-      //last_message = current_message; 
       last_message->next_message = first_message;
-      //this_last->next_message = NULL;
       pthread_mutex_unlock( &send_messages_lock );
     } else {
       /* start queue of messages to send and initiate thread */
@@ -294,7 +288,6 @@ balsa_send_message_real(MessageQueueItem
                          message_delete (current_message->orig);
         }
         next_message = current_message->next_message;
-        //mutt_free_header (&current_message->message);
         free( current_message );
         current_message = next_message;
     }
Index: balsa/libmutt/alias.c
===================================================================
RCS file: /cvs/gnome/balsa/libmutt/alias.c,v
retrieving revision 1.4
diff -u -p -r1.4 alias.c
--- balsa/libmutt/alias.c	1998/08/31 01:18:06	1.4
+++ balsa/libmutt/alias.c	2000/01/04 04:01:47
@@ -93,7 +93,7 @@ static ADDRESS *mutt_expand_aliases_r (A
 	  a->personal = safe_strdup (buffer);
 #ifdef EXACT_ADDRESS
 	  FREE (&a->val);
-#endif
+#endif /* EXACT_ADDRESS */
 	}
       }
     }
Index: balsa/libmutt/attach.c
===================================================================
RCS file: /cvs/gnome/balsa/libmutt/attach.c,v
retrieving revision 1.7
diff -u -p -r1.7 attach.c
--- balsa/libmutt/attach.c	1997/01/03 14:18:24	1.7
+++ balsa/libmutt/attach.c	2000/01/04 04:01:49
@@ -30,7 +30,7 @@
 
 #ifdef _PGPPATH
 #include "pgp.h"
-#endif
+#endif /* _PGPPATH */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -282,7 +282,7 @@ int mutt_edit_attachment (BODY *a)
   rfc1524_free_entry (&entry);
   return rc;
 }
-#endif
+#endif /* LIBMUTT */
 
 
 /* for compatibility with metamail */
@@ -966,4 +966,4 @@ int mutt_print_attachment (FILE *fp, BOD
     return 0;
   }
 }
-#endif
+#endif /* LIBMUTT */
Index: balsa/src/address-book.c
===================================================================
RCS file: /cvs/gnome/balsa/src/address-book.c,v
retrieving revision 1.6
diff -u -p -r1.6 address-book.c
--- balsa/src/address-book.c	1999/12/24 19:02:59	1.6
+++ balsa/src/address-book.c	2000/01/04 04:01:51
@@ -37,13 +37,14 @@ static gint ab_okay_cb(GtkWidget * widge
 static void ab_clear_clist(GtkCList * clist);
 static gint ab_delete_compare(gconstpointer a, gconstpointer b);
 static gint ab_switch_cb(GtkWidget * widget, gpointer data);
-/*#define AB_ADD_CB_USED*/
-#ifdef AB_ADD_CB_USED
-static gint ab_add_cb(GtkWidget * widget, gpointer data);
-#endif
 static void ab_load(GtkWidget * widget, gpointer data);
 static void ab_find(GtkWidget * group_entry) ;
 
+#ifdef AB_ADD_CB_USED
+static gint ab_add_cb(GtkWidget * widget, gpointer data);
+#endif /* AB_ADD_CB_USED */
+
+
 
 static gint
 ab_gnomecard_cb(GtkWidget * widget, gpointer data)
@@ -182,7 +183,7 @@ ab_add_cb(GtkWidget * widget, gpointer d
 
 	return FALSE;
 }
-#endif
+#endif /* AB_ADD_CB_USED */
 
 static void 
 ab_load(GtkWidget * widget, gpointer data) 
@@ -202,8 +203,9 @@ ab_load(GtkWidget * widget, gpointer dat
 	
 	gc = fopen(gnome_util_prepend_user_home(".gnome/GnomeCard.gcrd"), "r"); 
 	if (!gc) { 
-		g_print(N_("Unable to open ~/.gnome/GnomeCard.gcrd for read.\n - %s\n"), g_unix_error_string(errno)); 
-		return; 
+		g_print(N_("Unable to open ~/.gnome/GnomeCard.gcrd for read.\n - %s\n"), 	         
+			g_unix_error_string(errno)); 
+	 	return; 
 	} 
 
 	while ( fgets(string, 255, gc)) { 
Index: balsa/src/balsa-index-page.c
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-index-page.c,v
retrieving revision 1.12
diff -u -p -r1.12 balsa-index-page.c
--- balsa/src/balsa-index-page.c	1999/12/21 03:21:43	1.12
+++ balsa/src/balsa-index-page.c	2000/01/04 04:01:53
@@ -28,7 +28,6 @@
 #include "misc.h"
 #include "balsa-index-page.h"
 
-/*#define SIGNALS_USED*/
 #ifdef SIGNALS_USED
 enum
 {
@@ -42,7 +41,6 @@ enum
   TARGET_MESSAGE,
 };
 
-/*#define DND_USED*/
 #ifdef DND_USED
 
 static GtkTargetEntry drag_types[] =
@@ -65,7 +63,6 @@ static void index_button_press_cb (GtkWi
 
 /* menu item callbacks */
 
-/*#define MSG_STATUS_USED*/
 #ifdef MSG_STATUS_USED
 static void message_status_set_new_cb (GtkWidget *, Message *);
 static void message_status_set_read_cb (GtkWidget *, Message *);
@@ -80,6 +77,8 @@ static GtkObjectClass *parent_class = NU
 static guint signals[LAST_SIGNAL] = { 0 };
 #endif
 
+static gint handler = 0;
+
 static void balsa_index_page_class_init(BalsaIndexPageClass *class);
 static void balsa_index_page_init(BalsaIndexPage *page);
 void balsa_index_page_window_init(BalsaIndexPage *page);
@@ -118,7 +117,6 @@ balsa_index_page_class_init(BalsaIndexPa
 
   object_class = (GtkObjectClass *) class;
 
-  //  object_class->destroy = index_child_destroy;
   /*PKGW*/
   object_class->destroy = balsa_index_page_close_and_destroy;
 
@@ -156,7 +154,6 @@ balsa_index_page_window_init(BalsaIndexP
 				 GTK_POLICY_AUTOMATIC,
 				 GTK_POLICY_AUTOMATIC);
   index = balsa_index_new ();
-  //  gtk_widget_set_usize (index, -1, 200);
   gtk_container_add(GTK_CONTAINER(sw), index);
 
   gtk_widget_show(index);
@@ -174,8 +171,6 @@ balsa_index_page_window_init(BalsaIndexP
   /* setup the dnd stuff for the messages */
   gtk_object_set(GTK_OBJECT(index), "use_drag_icons", FALSE, NULL);
   gtk_object_set(GTK_OBJECT(index), "reorderable", FALSE, NULL);
-  // XXX
-  //  index_child_setup_dnd(child);
 
   bip->index = index;
   bip->sw = sw;
@@ -263,17 +258,9 @@ set_password (GtkWidget * widget, GtkWid
 void balsa_index_page_load_mailbox(BalsaIndexPage *page, Mailbox * mailbox)
 {
   GtkWidget *messagebox;
-  /*GdkCursor *cursor;*/
 
   page->mailbox = mailbox;
 
-#if 0
-  // XXX
-  cursor = gdk_cursor_new(GDK_WATCH);
-  balsa_window_set_cursor(page, cursor);
-  gdk_cursor_destroy(cursor);
-#endif
-
   if ((mailbox->type == MAILBOX_IMAP && !MAILBOX_IMAP(mailbox)->server->passwd) ||
       (mailbox->type == MAILBOX_POP3 && !MAILBOX_POP3(mailbox)->server->passwd))
   {
@@ -336,8 +323,6 @@ void balsa_index_page_close_and_destroy(
   g_return_if_fail( obj );
   page = BALSA_INDEX_PAGE( obj );
 
-/*    printf( "Close and destroy!\n" );*/
-
   if( page->index ) {
     gtk_widget_destroy( GTK_WIDGET( page->index ) );
     page->index = NULL;
@@ -355,9 +340,6 @@ void balsa_index_page_close_and_destroy(
     page->mailbox = NULL;
   }
 }
-
-static gint handler = 0;
-
 
 static gboolean
 idle_handler_cb(GtkWidget * widget)
Index: balsa/src/balsa-index.c
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-index.c,v
retrieving revision 1.116
diff -u -p -r1.116 balsa-index.c
--- balsa/src/balsa-index.c	1999/12/23 18:32:12	1.116
+++ balsa/src/balsa-index.c	2000/01/04 04:01:55
@@ -81,8 +81,7 @@ typedef void (*BalsaIndexSignal1) (GtkOb
 				   GdkEventButton * bevent,
 				   gpointer data);
 
-static gint balsa_index_signals[LAST_SIGNAL] =
-{0};
+static gint balsa_index_signals[LAST_SIGNAL] = {0};
 static GtkCListClass *parent_class = NULL;
 
 static gint
Index: balsa/src/balsa-mblist.c
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-mblist.c,v
retrieving revision 1.35
diff -u -p -r1.35 balsa-mblist.c
--- balsa/src/balsa-mblist.c	1999/12/23 18:32:12	1.35
+++ balsa/src/balsa-mblist.c	2000/01/04 04:01:56
@@ -263,9 +263,6 @@ balsa_mblist_insert_mailbox (BalsaMBList
   if (mblist->display_content_info)
     {
       mailbox_gather_content_info (balsa_app.trash);
-//      g_snprintf (text[1], INFO_FIELD_LENGTH, "%ld", (balsa_app.trash)->unread_messages);
-//      g_snprintf (text[2], INFO_FIELD_LENGTH, "%ld", (balsa_app.trash)->total_messages);
-//      balsa_mblist_add_watched_mailbox (mblist, balsa_app.trash);
     }
 #endif
 }
Index: balsa/src/balsa-mblist.h
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-mblist.h,v
retrieving revision 1.10
diff -u -p -r1.10 balsa-mblist.h
--- balsa/src/balsa-mblist.h	1999/02/24 03:33:12	1.10
+++ balsa/src/balsa-mblist.h	2000/01/04 04:01:56
@@ -50,4 +50,4 @@ GtkWidget *balsa_mblist_new (void);
 void balsa_mblist_redraw (BalsaMBList * bmbl);
 guint balsa_mblist_get_type (void);
 
-#endif
+#endif /* __BALSA_MBLIST_H__ */
Index: balsa/src/balsa-message.c
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-message.c,v
retrieving revision 1.85
diff -u -p -r1.85 balsa-message.c
--- balsa/src/balsa-message.c	1999/12/30 21:14:17	1.85
+++ balsa/src/balsa-message.c	2000/01/04 04:01:58
@@ -954,7 +954,7 @@ save_mime_part (Message * message, BODY 
   fseek (s.fpin, body->offset, 0);
   if (!s.fpout)
     {
-      /* error */
+      /* FIXME: error msg here */
     }
   mutt_decode_attachment (body, &s);
   fclose (s.fpin);
Index: balsa/src/balsa-message.h
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-message.h,v
retrieving revision 1.15
diff -u -p -r1.15 balsa-message.h
--- balsa/src/balsa-message.h	1999/12/15 04:30:23	1.15
+++ balsa/src/balsa-message.h	2000/01/04 04:01:59
@@ -26,7 +26,7 @@
 #ifdef __cplusplus
 extern "C"
 {
-#endif				/* __cplusplus */
+#endif	/* __cplusplus */
 
 
 #define BALSA_MESSAGE(obj)          GTK_CHECK_CAST (obj, balsa_message_get_type (), BalsaMessage)
@@ -58,5 +58,5 @@ extern "C"
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
-#endif				/* __BALSA_MESSAGE_H__ */
+#endif	/* __cplusplus */
+#endif	/* __BALSA_MESSAGE_H__ */
Index: balsa/src/mailbox-conf.c
===================================================================
RCS file: /cvs/gnome/balsa/src/mailbox-conf.c,v
retrieving revision 1.50
diff -u -p -r1.50 mailbox-conf.c
--- balsa/src/mailbox-conf.c	1999/12/12 23:07:02	1.50
+++ balsa/src/mailbox-conf.c	2000/01/04 04:02:01
@@ -565,21 +565,6 @@ conf_update_mailbox (Mailbox * mailbox, 
       g_free (MAILBOX_IMAP (mailbox)->path);
       g_free (MAILBOX_IMAP (mailbox)->server->host);
 
-#if 0
-      mailbox->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (mcw->imap_mailbox_name)));
-      MAILBOX_IMAP (mailbox)->user = g_strdup (gtk_entry_get_text (GTK_ENTRY (mcw->imap_username)));
-      MAILBOX_IMAP (mailbox)->passwd = g_strdup (gtk_entry_get_text (GTK_ENTRY (mcw->imap_password)));
-      MAILBOX_IMAP (mailbox)->path = g_strdup (gtk_entry_get_text (GTK_ENTRY (mcw->imap_mailbox_path)));
-      if (!MAILBOX_IMAP (mailbox)->path[0])
-	{
-	  g_free (MAILBOX_IMAP (mailbox)->path);
-	  MAILBOX_IMAP (mailbox)->path = g_strdup ("INBOX");
-	}
-      MAILBOX_IMAP (mailbox)->server->host = g_strdup (gtk_entry_get_text (GTK_ENTRY (mcw->imap_server)));
-      MAILBOX_IMAP (mailbox)->server->port = strtol (gtk_entry_get_text (GTK_ENTRY (mcw->imap_port)), (char **) NULL, 10);
-
-      config_mailbox_update (mailbox, old_mbox_name);
-#endif
       break;
 
     case MAILBOX_UNKNOWN:
Index: balsa/src/main-window.c
===================================================================
RCS file: /cvs/gnome/balsa/src/main-window.c,v
retrieving revision 1.236
diff -u -p -r1.236 main-window.c
--- balsa/src/main-window.c	1999/12/30 21:14:17	1.236
+++ balsa/src/main-window.c	2000/01/04 04:02:05
@@ -169,8 +169,6 @@ static GnomeUIInfo file_menu[] =
   GNOMEUIINFO_SEPARATOR,
   #endif
 
-  // XXX 
-  // GNOMEUIINFO_MENU_EXIT_ITEM(close_main_window, NULL), 
   GNOMEUIINFO_MENU_EXIT_ITEM(balsa_exit, NULL),
 
   GNOMEUIINFO_END
@@ -240,12 +238,6 @@ static GnomeUIInfo open_mailboxes[] =
 
 static GnomeUIInfo mailbox_menu[] =
 {
-#if 0
-  {
-    GNOME_APP_UI_ITEM, N_ ("List"), NULL, mblist_window_cb, NULL,
-    NULL, GNOME_APP_PIXMAP_NONE, GNOME_STOCK_MENU_PROP, 'C', 0, NULL
-  },
-#endif
   GNOMEUIINFO_ITEM_STOCK (N_ ("_Open"), N_("Open the selected mailbox"),
 			  mblist_menu_open_cb, GNOME_STOCK_MENU_OPEN),
   GNOMEUIINFO_ITEM_STOCK (N_ ("_Close"), N_("Close the selected mailbox"),
@@ -422,9 +414,6 @@ balsa_window_class_init (BalsaWindowClas
 static void
 balsa_window_init (BalsaWindow *window)
 {
-  //  window->modal = FALSE;
-  
-  //  gtk_container_register_toplevel (GTK_CONTAINER (window));
 }
 
 GtkWidget*
@@ -625,24 +614,8 @@ static GtkWidget *balsa_window_create_pr
 static void balsa_window_destroy (GtkObject     *object)
 {
   BalsaWindow *window;
-  /*
-    gint x, y;
-    gchar *geometry;
-    XXX this is too late to get the right width and height
-    geometry = gnome_geometry_string(GTK_WIDGET(object)->window);
-    gnome_parse_geometry(geometry,
-                       &x, &y,
-                       &balsa_app.mw_width, 
-		       &balsa_app.mw_height);
-  g_free (geometry);
-  */
 
   window = BALSA_WINDOW(object);
-
-  /*
-  balsa_app.mw_width = GTK_WIDGET(object)->allocation.width;
-  balsa_app.mw_height = GTK_WIDGET(object)->allocation.height;
-  */
 
   if (GTK_OBJECT_CLASS(parent_class)->destroy)
     (*GTK_OBJECT_CLASS(parent_class)->destroy)(GTK_OBJECT(object));
Index: balsa/src/main.c
===================================================================
RCS file: /cvs/gnome/balsa/src/main.c,v
retrieving revision 1.63
diff -u -p -r1.63 main.c
--- balsa/src/main.c	1999/12/30 19:32:38	1.63
+++ balsa/src/main.c	2000/01/04 04:02:06
@@ -239,7 +239,7 @@ main (int argc, char *argv[])
   mailboxes_init ();
 
 #ifdef BALSA_USE_THREADS
-  /* initiate thread mutexs, variables */
+  /* initiate thread mutexes, variables */
   threads_init( TRUE );
 #endif  
 
Index: balsa/src/mblist-window.c
===================================================================
RCS file: /cvs/gnome/balsa/src/mblist-window.c,v
retrieving revision 1.94
diff -u -p -r1.94 mblist-window.c
--- balsa/src/mblist-window.c	1999/12/23 18:32:12	1.94
+++ balsa/src/mblist-window.c	2000/01/04 04:02:07
@@ -96,9 +96,6 @@ GtkWidget *balsa_mailbox_list_window_new
    *  gtk_widget_set_usize (GTK_WIDGET (mblw->ctree), balsa_app.mblist_width, balsa_app.mblist_height);
    */
 
-/*
-   gtk_ctree_show_stub (mblw->ctree, FALSE);
- */
   gtk_ctree_set_line_style (mblw->ctree, GTK_CTREE_LINES_DOTTED);
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(widget),
Index: balsa/src/pref-manager.c
===================================================================
RCS file: /cvs/gnome/balsa/src/pref-manager.c,v
retrieving revision 1.91
diff -u -p -r1.91 pref-manager.c
--- balsa/src/pref-manager.c	1999/12/31 12:03:09	1.91
+++ balsa/src/pref-manager.c	2000/01/04 04:02:11
@@ -571,9 +571,6 @@ apply_prefs (GtkWidget * pbox, PropertyU
 
 	balsa_app.check_mail_upon_startup = GTK_TOGGLE_BUTTON(pui->check_mail_upon_startup)->active;
 	balsa_app.empty_trash_on_exit = GTK_TOGGLE_BUTTON(pui->empty_trash)->active;
-
-	// XXX
-	//  refresh_main_window ();
 	
 	/*
 	 * close window and free memory
@@ -581,7 +578,7 @@ apply_prefs (GtkWidget * pbox, PropertyU
 	config_global_save ();
 
 	/*
-	 * Setting the Apply buttin insensitive again
+	 * Setting the Apply button insensitive again
 	 */
 	{
 		GtkWidget *btn;
Index: balsa/src/spell-check.c
===================================================================
RCS file: /cvs/gnome/balsa/src/spell-check.c,v
retrieving revision 1.3
diff -u -p -r1.3 spell-check.c
--- balsa/src/spell-check.c	1999/02/21 15:28:35	1.3
+++ balsa/src/spell-check.c	2000/01/04 04:02:12
@@ -66,18 +66,7 @@ void spell_destroy(GtkWidget *widget, gp
 
 void spell_exit(GtkWidget *widget, gpointer data)
 {
-	/*
-	gint newdoc, i;
 
-  	if(plugin->oldindex < strlen(plugin->buffer)) {
-		for(i=plugin->oldindex; i<strlen(plugin->buffer); i++)
-        		plugin->result[i+(plugin->offs)]=plugin->buffer[i];
-  	}
-  	newdoc = client_document_new(plugin->context, "Spell Checked");
-  	client_text_append(newdoc,plugin->result, strlen(plugin->result));
-  	client_document_show(newdoc); 
-	*/
-
   	g_free(plugin->result);
   	client_finish(plugin->context);
   	gtk_exit(0);
@@ -199,16 +188,6 @@ void handled_word_callback(GtkWidget *sp
 	    plugin->drift += (len - strlen (r));
 	    client_text_set_selection_text (plugin->context, r, strlen (r));
 	  }
-
-	/*
-	for(i=plugin->oldindex; i<start; i++)
-		plugin->result[i+(plugin->offs)]=plugin->buffer[i];
-	strcpy(plugin->offs + i + plugin->result,r);
-	plugin->oldindex = plugin->index;
-	if(si->replacement)
-		plugin->offs += strlen(si->replacement) - strlen(si->word);
-	g_print("%s\n",plugin->result);	
-	*/
 
 	plugin->handling = 1;
 	gtk_idle_add((GtkFunction) spell_start_check, NULL);
Index: balsa/src/spell-check.h
===================================================================
RCS file: /cvs/gnome/balsa/src/spell-check.h,v
retrieving revision 1.2
diff -u -p -r1.2 spell-check.h
--- balsa/src/spell-check.h	1998/12/16 05:37:09	1.2
+++ balsa/src/spell-check.h	2000/01/04 04:02:12
@@ -1,3 +1,22 @@
+/* spell.h - Spell plugin.
+ *
+ * Copyright (C) 1998-1999 Martin Wahlen.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
 #ifndef __BALSA_SPELL_CHECK_H__
 #define __BALSA_SPELL_CHECK_H__

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