simplemail-cvs — Changes in the CVS

[Simplemail-cvs] CVS: configuration.c,NONE,1.1 configuration.h,NONE,1.1 addressbook.c,1.4,1.5 dl.c,1.1,1.2 mail.c,1.11,1.12 simplemail.c,1.5,1.6

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15850

Modified Files:
	addressbook.c dl.c mail.c simplemail.c 
Added Files:
	configuration.c configuration.h 
Log Message:
Added support of a configuration file and removed support of the now obsoletet env variables

--- NEW FILE ---
/***************************************************************************
 SimpleMail - Copyright (C) 2000 Hynek Schlawack and Sebastian Bauer

 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 of the License, 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
***************************************************************************/
#ifndef SM__CONFIGURATION_H
#define SM__CONFIGURATION_H

struct config
{
	char *realname;
	char *email;
	char *smtp_server;
	char *smtp_domain;
	char *pop_server;
	char *pop_login;
	char *pop_password;
};

struct user
{
	char *name; /* name of the user */
	char *directory; /* the directory where all data is saved */

	char *config_filename; /* path to the the configuration */

	struct config config;
};

int load_config(void);
void save_config(void);

extern struct user user; /* the current user */

#endif


Index: addressbook.c
===================================================================
RCS file: /cvsroot/simplemail/addressbook.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** addressbook.c	2000/12/08 21:14:15	1.4
--- addressbook.c	2000/12/09 19:31:30	1.5
***************
*** 35,39 ****
   Reads a line. The buffer doesn't contain an LF's
  **************************************************************************/
! static int read_line(FILE *fh, char *buf)
  {
  	int len;
--- 35,39 ----
   Reads a line. The buffer doesn't contain an LF's
  **************************************************************************/
! int read_line(FILE *fh, char *buf)
  {
  	int len;

Index: dl.c
===================================================================
RCS file: /cvsroot/simplemail/dl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dl.c	2000/12/01 08:50:24	1.1
--- dl.c	2000/12/09 19:31:30	1.2
***************
*** 7,10 ****
--- 7,11 ----
  #include <stdio.h>
  
+ #include "configuration.h"
  #include "dlwnd.h"
  #include "folder.h"
***************
*** 13,46 ****
  #include "smtp.h"
  
  int mails_dl(void)
  {
- 	int rc;
  	char *server, *login, *passwd, *buf;
! 	
! 	rc = 0;
! 	
! 	buf = getenv("SIMPLEMAIL_POP3_SERVER");
! 	server = malloc(strlen(buf) + 1);
! 	strcpy(server, buf);
! 	buf = getenv("SIMPLEMAIL_LOGIN");
! 	login = malloc(strlen(buf) + 1);
! 	strcpy(login, buf);
! 	buf = getenv("SIMPLEMAIL_PASSWD");
! 	passwd = malloc(strlen(buf) + 1);
! 	strcpy(passwd, buf);
! 	
  	set_dl_title(server);
  	dl_window_open();
! 	
! 	
  	pop3_dl(server, 110, login, passwd);
! 	
  	dl_window_close();
  
! 	free(server);
! 	free(login);
! 	free(passwd);
! 	
! 	return(rc);
  }
  
--- 14,42 ----
  #include "smtp.h"
  
+ #include "io.h" /* io.c should be removed after stuff has been moved to support.h */
+ 
  int mails_dl(void)
  {
  	char *server, *login, *passwd, *buf;
! 
! 	server = user.config.pop_server;
! 	login = user.config.pop_login;
! 	passwd = user.config.pop_password;
! 
! 	if (!server)
! 	{
! 		tell("Please configure a pop3 server!");
! 		return 0;
! 	}
! 
  	set_dl_title(server);
  	dl_window_open();
! 
! 	/* Here we must create a new task which then downloads the mails */
  	pop3_dl(server, 110, login, passwd);
! 
  	dl_window_close();
  
! 	return 0;
  }
  
***************
*** 58,61 ****
--- 54,72 ----
  	char path[256];
  
+ 	server = user.config.smtp_server;
+ 	domain = user.config.smtp_domain;
+ 
+ 	if (!server)
+ 	{
+ 		tell("Please specify a smtp server!");
+ 		return 0;
+ 	}
+ 
+ 	if (!domain)
+ 	{
+ 		tell("Please configure a domain!");
+ 		return 0;
+ 	}
+ 
  	getcwd(path, sizeof(path));
  	if(chdir(out_folder->path) == -1) return 0;
***************
*** 63,69 ****
  	if (!out_folder) return NULL;
  
- 	server = strdup(getenv("SIMPLEMAIL_SMTP_SERVER"));
- 	domain = strdup(getenv("SIMPLEMAIL_DOMAIN"));
- 
  	while ((m = folder_next_mail(out_folder, &handle)))
  	{
--- 74,77 ----
***************
*** 109,115 ****
  		if (mb.addr_spec) free(mb.addr_spec);
  	}
- 
- 	free(server);
- 	free(domain);
  
  	chdir(path);
--- 117,120 ----

Index: mail.c
===================================================================
RCS file: /cvsroot/simplemail/mail.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** mail.c	2000/12/09 14:29:54	1.11
--- mail.c	2000/12/09 19:31:30	1.12
***************
*** 24,27 ****
--- 24,28 ----
  #include "addressbook.h"
  #include "codecs.h"
+ #include "configuration.h"
  #include "folder.h" /* for mail_compose_new() */
  #include "mail.h"
***************
*** 1013,1025 ****
  
  /**************************************************************************
-  Returns the e-mail Adress of the current user.
-  (should be placed otherwhere)
- **************************************************************************/
- char *user_get_email(void)
- {
- 	return getenv("SIMPLEMAIL_EMAIL");
- }
- 
- /**************************************************************************
   Creates an address list from a given string (Note, that this is probably
   misplaced in mail.c)
--- 1014,1017 ----
***************
*** 1086,1089 ****
--- 1078,1108 ----
  
  /**************************************************************************
+  Writes out the from header field (it shouldn't be inlined because
+  it uses some stack space
+ **************************************************************************/
+ int mail_compose_write_from(FILE *fp)
+ {
+ 	struct list list;
+ 	struct address address;
+ 	char *from;
+ 	int rc = 0;
+ 
+ 	list_init(&list);
+ 	memset(&address,0,sizeof(struct address));
+ 
+ 	address.realname = user.config.realname;
+ 	address.email = user.config.email;
+ 	list_insert_tail(&list,&address.node);
+ 
+ 	if ((from = encode_address_field("From", &list)))
+ 	{
+ 		if (fprintf(fp,"%s\n",from)>=0) rc = 1;
+ 		free(from);
+ 	}
+ 
+ 	return rc;
+ }
+ 
+ /**************************************************************************
   Writes out the attachments into the body (uses recursion)
  **************************************************************************/
***************
*** 1095,1110 ****
  	{
  		char *subject;
! 		struct list *alist = create_address_list(user_get_email());
  
! 		if (alist)
! 		{
! 			char *from = encode_address_field("From", alist);
! 			if (from)
! 			{
! 				fprintf(fp,"%s\n",from);
! 				free(from);
! 			}
! 			free_address_list(alist);
! 		}
  
  		if ((alist = create_address_list(new_mail->to)))
--- 1114,1121 ----
  	{
  		char *subject;
! 		struct list *alist;
  
! 		if (!mail_compose_write_from(fp))
! 			return 0;
  
  		if ((alist = create_address_list(new_mail->to)))
***************
*** 1209,1212 ****
--- 1220,1224 ----
  		if (body) free(body);
  	}
+ 	return 1;
  }
  

Index: simplemail.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** simplemail.c	2000/12/09 14:29:54	1.5
--- simplemail.c	2000/12/09 19:31:30	1.6
***************
*** 31,34 ****
--- 31,35 ----
  
  #include "addressbook.h"
+ #include "configuration.h"
  #include "dl.h"
  #include "folder.h"
***************
*** 213,216 ****
--- 214,218 ----
  int main(void)
  {
+ 	load_config();
  	init_addressbook();
  	if (init_folders())

[Simplemail-cvs] CVS: amiga-mui composewnd.c,1.15,1.16 mainwnd.c,1.4,1.5

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/amiga-mui
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17884/amiga-mui

Modified Files:
	composewnd.c mainwnd.c 
Log Message:
Added support for replying email messaged

Index: composewnd.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/composewnd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** composewnd.c	2000/12/07 18:53:33	1.15
--- composewnd.c	2000/12/09 14:29:56	1.16
***************
*** 395,399 ****
  
  	memset(&attach,0,sizeof(attach));
! 	sprintf(buf,"%s/%s",mail->content_type,mail->content_subtype);
  	attach.content_type = buf;
  
--- 395,409 ----
  
  	memset(&attach,0,sizeof(attach));
! 
! 	if (mail->content_type)
! 	{
! 		/* If the mail has a content type */
! 		sprintf(buf,"%s/%s",mail->content_type,mail->content_subtype);
! 	} else
! 	{
! 		/* Use text/plain as the default content type */
! 		strcpy(buf,"text/plain");
! 	}
! 
  	attach.content_type = buf;
  

Index: mainwnd.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/mainwnd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mainwnd.c	2000/12/05 02:49:51	1.4
--- mainwnd.c	2000/12/09 14:29:56	1.5
***************
*** 55,58 ****
--- 55,59 ----
  static Object *button_change;
  static Object *button_new;
+ static Object *button_reply;
  static Object *button_abook;
  static Object *tree_folder, *tree_mail;
***************
*** 194,197 ****
--- 195,199 ----
  				Child, button_delete = MakeButton("_Delete"),
  				Child, button_new = MakeButton("_New"),
+ 				Child, button_reply = MakeButton("_Reply"),
  				Child, button_fetch = MakeButton("_Fetch Mails"),
  				Child, button_send = MakeButton("_Send Mails"),
***************
*** 229,232 ****
--- 231,235 ----
  		DoMethod(button_send, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Application, 3, MUIM_CallHook, &hook_standard, callback_send_mails);
  		DoMethod(button_new, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Application, 3, MUIM_CallHook, &hook_standard, callback_new_mail);
+ 		DoMethod(button_reply, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Application, 3, MUIM_CallHook, &hook_standard, callback_reply_mail);
  		DoMethod(button_change, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Application, 3, MUIM_CallHook, &hook_standard, callback_change_mail);
  		DoMethod(button_abook, MUIM_Notify, MUIA_Pressed, FALSE, MUIV_Notify_Application, 3, MUIM_CallHook, &hook_standard, callback_addressbook);

[Simplemail-cvs] CVS: mail.c,1.10,1.11 mail.h,1.3,1.4 simplemail.c,1.4,1.5 simplemail.h,1.3,1.4

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17884

Modified Files:
	mail.c mail.h simplemail.c simplemail.h 
Log Message:
Added support for replying email messaged

Index: mail.h
===================================================================
RCS file: /cvsroot/simplemail/mail.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mail.h	2000/12/05 02:49:51	1.3
--- mail.h	2000/12/09 14:29:54	1.4
***************
*** 71,74 ****
--- 71,75 ----
  struct mail *mail_create(void);
  struct mail *mail_create_from_file(char *filename);
+ struct mail *mail_create_reply(struct mail *mail);
  void mail_free(struct mail *mail);
  int mail_set_stuff(struct mail *mail, char *filename, unsigned int size);

Index: simplemail.c
===================================================================
RCS file: /cvsroot/simplemail/simplemail.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** simplemail.c	2000/12/05 02:49:51	1.4
--- simplemail.c	2000/12/09 14:29:54	1.5
***************
*** 71,74 ****
--- 71,103 ----
  }
  
+ /* a mail should be replied */
+ void callback_reply_mail(void)
+ {
+ 	char *filename;
+ 
+ 	if ((filename = main_get_mail_filename()))
+ 	{
+ 		struct mail *mail;
+ 		char buf[256];
+ 
+ 		getcwd(buf, sizeof(buf));
+ 		chdir(main_get_folder_drawer());
+ 
+ 		if ((mail = mail_create_from_file(filename)))
+ 		{
+ 			struct mail *reply;
+ 			mail_read_contents("",mail);
+ 			if ((reply = mail_create_reply(mail)))
+ 			{
+ 				compose_window_open(NULL,reply);
+ 				mail_free(reply);
+ 			}
+ 			mail_free(mail);
+ 		}
+ 
+ 		chdir(buf);
+ 	}
+ }
+ 
  /* the currently selected mail should be changed */
  void callback_change_mail(void)

Index: simplemail.h
===================================================================
RCS file: /cvsroot/simplemail/simplemail.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** simplemail.h	2000/12/05 02:49:51	1.3
--- simplemail.h	2000/12/09 14:29:54	1.4
***************
*** 22,25 ****
--- 22,26 ----
  void callback_delete_mails(void);
  void callback_new_mail(void);
+ void callback_reply_mail(void);
  void callback_change_mail(void);
  void callback_fetch_mails(void);

[Simplemail-cvs] CVS: folder.c,1.2,1.3 folder.h,1.2,1.3

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15229

Modified Files:
	folder.c folder.h 
Log Message:
Added copyright information

Index: folder.h
===================================================================
RCS file: /cvsroot/simplemail/folder.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** folder.h	2000/12/05 02:48:53	1.2
--- folder.h	2000/12/09 08:39:31	1.3
***************
*** 1,2 ****
--- 1,19 ----
+ /***************************************************************************
+  SimpleMail - Copyright (C) 2000 Hynek Schlawack and Sebastian Bauer
+ 
+  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 of the License, 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ***************************************************************************/
  #ifndef SM__FOLDER_H
  #define SM__FOLDER_H

[Simplemail-cvs] CVS: amiga-mui addressbookwnd.c,1.3,1.4

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/amiga-mui
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26110/amiga-mui

Modified Files:
	addressbookwnd.c 
Log Message:
A Addressgroup within the Addressbook can be really changed now.

Index: addressbookwnd.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/addressbookwnd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addressbookwnd.c	2000/12/08 21:14:15	1.3
--- addressbookwnd.c	2000/12/08 21:39:48	1.4
***************
*** 414,424 ****
  	if ((new_entry = addressbook_new_group(NULL)))
  	{
  		char *alias = (char*)xget(data->alias_string,MUIA_String_Contents);
  		if (alias && *alias) addressbook_set_alias(new_entry, alias);
  		addressbook_set_description(new_entry, (char *)xget(data->description_string,MUIA_String_Contents));
  
! 		/* Now add it to the listview (in the active list) */
! 		DoMethod(address_tree, MUIM_NListtree_Insert, "" /*name*/, new_entry, /*udata */
  						   MUIV_NListtree_Insert_ListNode_ActiveFallback,MUIV_NListtree_Insert_PrevNode_Tail,TNF_LIST|TNF_OPEN);
  
  		addressbook_free_entry(new_entry);
--- 414,436 ----
  	if ((new_entry = addressbook_new_group(NULL)))
  	{
+ 		struct MUI_NListtree_TreeNode *treenode = NULL;
  		char *alias = (char*)xget(data->alias_string,MUIA_String_Contents);
  		if (alias && *alias) addressbook_set_alias(new_entry, alias);
  		addressbook_set_description(new_entry, (char *)xget(data->description_string,MUIA_String_Contents));
  
! 		if (data->group)
! 		{
! 			if ((treenode = FindListtreeUserData(address_tree, data->group)))
! 			{
! 				DoMethod(address_tree, MUIM_NListtree_Rename, treenode, new_entry, MUIV_NListtree_Rename_Flag_User);
! 			}
! 		}
! 
! 		if (!treenode)
! 		{
! 			/* Now add it to the listview (in the active list) */
! 			DoMethod(address_tree, MUIM_NListtree_Insert, "" /*name*/, new_entry, /*udata */
  						   MUIV_NListtree_Insert_ListNode_ActiveFallback,MUIV_NListtree_Insert_PrevNode_Tail,TNF_LIST|TNF_OPEN);
+ 		}
  
  		addressbook_free_entry(new_entry);

[Simplemail-cvs] CVS: amiga-mui addressbookwnd.c,1.2,1.3

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/amiga-mui
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23436/amiga-mui

Modified Files:
	addressbookwnd.c 
Log Message:
Addressbook can be saved and loaded

Index: addressbookwnd.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/addressbookwnd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addressbookwnd.c	2000/12/08 13:39:10	1.2
--- addressbookwnd.c	2000/12/08 21:14:15	1.3
***************
*** 602,609 ****
   Save the addressbook to disk
  *******************************************************************/
! static void addressbook_save(void)
  {
  	cleanup_addressbook();
  	addressbook_update(NULL,NULL);
  }
  
--- 602,610 ----
   Save the addressbook to disk
  *******************************************************************/
! static void addressbook_save_pressed(void)
  {
  	cleanup_addressbook();
  	addressbook_update(NULL,NULL);
+ 	addressbook_save();
  }
  
***************
*** 761,765 ****
  	DoMethod(App,OM_ADDMEMBER,address_wnd);
  	DoMethod(address_wnd, MUIM_Notify, MUIA_Window_CloseRequest, TRUE, address_wnd, 3, MUIM_Set, MUIA_Window_Open, FALSE);
! 	DoMethod(save_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_save);
  	DoMethod(new_person_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_add_person);
  	DoMethod(new_group_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_add_group);
--- 762,766 ----
  	DoMethod(App,OM_ADDMEMBER,address_wnd);
  	DoMethod(address_wnd, MUIM_Notify, MUIA_Window_CloseRequest, TRUE, address_wnd, 3, MUIM_Set, MUIA_Window_Open, FALSE);
! 	DoMethod(save_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_save_pressed);
  	DoMethod(new_person_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_add_person);
  	DoMethod(new_group_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_add_group);

[Simplemail-cvs] CVS: addressbook.c,1.3,1.4 addressbook.h,1.3,1.4

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23436

Modified Files:
	addressbook.c addressbook.h 
Log Message:
Addressbook can be saved and loaded

Index: addressbook.h
===================================================================
RCS file: /cvsroot/simplemail/addressbook.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addressbook.h	2000/12/08 13:39:10	1.3
--- addressbook.h	2000/12/08 21:14:15	1.4
***************
*** 77,80 ****
--- 77,83 ----
  void init_addressbook(void);
  void cleanup_addressbook(void);
+ int addressbook_load(void);
+ void addressbook_save(void);
+ 
  void addressbook_insert_tail(struct addressbook_entry *entry, struct addressbook_entry *new_entry);
  struct addressbook_entry *addressbook_create_person(char *realname, char *email);

[Simplemail-cvs] CVS: mail.c,1.9,1.10

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23492

Modified Files:
	mail.c 
Log Message:
The last boundary string must have two hyphens at the end

[Simplemail-cvs] CVS: amiga-mui addressbookwnd.c,1.1,1.2

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/amiga-mui
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20424/amiga-mui

Modified Files:
	addressbookwnd.c 
Log Message:
Internal Addressbook can be syncroned now

Index: addressbookwnd.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/addressbookwnd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addressbookwnd.c	2000/12/01 08:54:25	1.1
--- addressbookwnd.c	2000/12/08 13:39:10	1.2
***************
*** 260,267 ****
  
  			Child, HGroup,
! 				Child, ColGroup(3),
  					Child, HorizLineTextObject("Snail mail"),
  					Child, HorizLineTextObject("Miscellanous"),
! 					Child, HorizLineTextObject("Portrait"),
  	
  					Child, ColGroup(2),
--- 260,267 ----
  
  			Child, HGroup,
! 				Child, ColGroup(2),
  					Child, HorizLineTextObject("Snail mail"),
  					Child, HorizLineTextObject("Miscellanous"),
! /*					Child, HorizLineTextObject("Portrait"),*/
  	
  					Child, ColGroup(2),
***************
*** 300,304 ****
  							End,
  						End,
! 					Child, HVSpace, /* portrait */
  					End,
  				End,
--- 300,304 ----
  							End,
  						End,
! /*					Child, HVSpace,*/ /* portrait */
  					End,
  				End,
***************
*** 558,561 ****
--- 558,612 ----
  
  /******************************************************************
+  Updates the internal address book
+ *******************************************************************/
+ static void addressbook_update(struct MUI_NListtree_TreeNode *treenode, struct addressbook_entry *group)
+ {
+ 	struct addressbook_entry *entry;
+ /*	cleanup_addressbook();*/
+ 	if (!treenode) treenode = (struct MUI_NListtree_TreeNode *)DoMethod(address_tree,
+ 				MUIM_NListtree_GetEntry, MUIV_NListtree_GetEntry_ListNode_Root, MUIV_NListtree_GetEntry_Position_Head, 0);
+ 
+ 	if (!treenode) return;
+ 
+ 	while (treenode)
+ 	{
+ 		if ((entry = (struct addressbook_entry *)treenode->tn_User))
+ 		{
+ 			if (treenode->tn_Flags & TNF_LIST)
+ 			{
+ 				struct MUI_NListtree_TreeNode *tn = (struct MUI_NListtree_TreeNode *)DoMethod(address_tree,
+ 						MUIM_NListtree_GetEntry, treenode, MUIV_NListtree_GetEntry_Position_Head, 0);
+ 				struct addressbook_entry *new_group = addressbook_duplicate_entry(entry);
+ 				
+ 				if (new_group)
+ 				{
+ 					addressbook_insert_tail(group,new_group);
+ 					if (tn) addressbook_update(tn,new_group);
+ 				}
+ 			} else
+ 			{
+ 				if (entry->type == ADDRESSBOOK_ENTRY_PERSON)
+ 				{
+ 					struct addressbook_entry *new_person = addressbook_duplicate_entry(entry);
+ 
+ 					if (new_person)
+ 						addressbook_insert_tail(group,new_person);
+ 				}
+ 			}
+ 		}
+ 		treenode = (struct MUI_NListtree_TreeNode*)DoMethod(address_tree, MUIM_NListtree_GetEntry, treenode, MUIV_NListtree_GetEntry_Position_Next,0);
+ 	}
+ }
+ 
+ /******************************************************************
+  Save the addressbook to disk
+ *******************************************************************/
+ static void addressbook_save(void)
+ {
+ 	cleanup_addressbook();
+ 	addressbook_update(NULL,NULL);
+ }
+ 
+ /******************************************************************
   Adds a new person to the window
  *******************************************************************/
***************
*** 710,713 ****
--- 761,765 ----
  	DoMethod(App,OM_ADDMEMBER,address_wnd);
  	DoMethod(address_wnd, MUIM_Notify, MUIA_Window_CloseRequest, TRUE, address_wnd, 3, MUIM_Set, MUIA_Window_Open, FALSE);
+ 	DoMethod(save_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_save);
  	DoMethod(new_person_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_add_person);
  	DoMethod(new_group_button, MUIM_Notify, MUIA_Pressed, FALSE, App, 3, MUIM_CallHook, &hook_standard, addressbook_add_group);

[Simplemail-cvs] CVS: addressbook.c,1.2,1.3 addressbook.h,1.2,1.3

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20424

Modified Files:
	addressbook.c addressbook.h 
Log Message:
Internal Addressbook can be syncroned now

Index: addressbook.h
===================================================================
RCS file: /cvsroot/simplemail/addressbook.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addressbook.h	2000/12/02 00:23:01	1.2
--- addressbook.h	2000/12/08 13:39:10	1.3
***************
*** 77,80 ****
--- 77,81 ----
  void init_addressbook(void);
  void cleanup_addressbook(void);
+ void addressbook_insert_tail(struct addressbook_entry *entry, struct addressbook_entry *new_entry);
  struct addressbook_entry *addressbook_create_person(char *realname, char *email);
  struct addressbook_entry *addressbook_new_person(struct addressbook_entry *list, char *realname, char *email);

[Simplemail-cvs] CVS: mail.c,1.8,1.9

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2269

Modified Files:
	mail.c 
Log Message:
Use mystristr() for Content-Disposition filename identifying and fixed a small bug

[Simplemail-cvs] CVS: amiga-mui composewnd.c,1.14,1.15

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/amiga-mui
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1735/amiga-mui

Modified Files:
	composewnd.c 
Log Message:
Use the temporay filename for the DataTypes Object if one exists

Index: composewnd.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/composewnd.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** composewnd.c	2000/12/06 21:25:51	1.14
--- composewnd.c	2000/12/07 18:53:33	1.15
***************
*** 299,303 ****
  				TAG_DONE);
  
! 		set(data->datatype_datatypes, MUIA_DataTypes_FileName, attach->filename);
  	} else
  	{
--- 299,303 ----
  				TAG_DONE);
  
! 		set(data->datatype_datatypes, MUIA_DataTypes_FileName, attach->temporary_filename?attach->temporary_filename:attach->filename);
  	} else
  	{

[Simplemail-cvs] CVS: amiga-mui support.c,1.5,1.6

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/amiga-mui
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1566/amiga-mui

Modified Files:
	support.c 
Log Message:
mystristr() was buggy

Index: support.c
===================================================================
RCS file: /cvsroot/simplemail/amiga-mui/support.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** support.c	2000/12/06 21:23:44	1.5
--- support.c	2000/12/07 18:52:00	1.6
***************
*** 179,183 ****
  char *mystristr(const char *str1, const char *str2)
  {
- 	const char *buf = str1;
  	char c;
  	int str2_len = strlen(str2);
--- 179,182 ----
***************
*** 185,189 ****
  	while (*str1)
  	{
! 		if (!Strnicmp(buf,str1,str2_len))
  			return str1;
  		str1++;
--- 184,188 ----
  	while (*str1)
  	{
! 		if (!Strnicmp(str1,str2,str2_len))
  			return str1;
  		str1++;

[Simplemail-cvs] CVS: lists.c,1.1,1.2 lists.h,1.1,1.2

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail
In directory slayer.i.sourceforge.net:/tmp/cvs-serv29632

Modified Files:
	lists.c lists.h 
Log Message:
Added copyright information

Index: lists.h
===================================================================
RCS file: /cvsroot/simplemail/lists.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lists.h	2000/12/01 08:50:24	1.1
--- lists.h	2000/12/07 18:14:44	1.2
***************
*** 1,2 ****
--- 1,19 ----
+ /***************************************************************************
+  SimpleMail - Copyright (C) 2000 Hynek Schlawack and Sebastian Bauer
+ 
+  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 of the License, 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ***************************************************************************/
  #ifndef SM__LISTS_H
  #define SM__LISTS_H