Menu
▾
▴
[Corem-cvs] CORE CVS: src smugg
|
From: CORE C. L. <cor...@li...> - 2000-11-20 21:02:14
|
Core CVS committal
Author : smugg
Project : core
Module : src
Modified Files:
account.c account.h callbacks.c callbacks.h panes.c prefs.c
Log Message:
bad memory, cant remember my changes
===================================================================
RCS file: /cvsroot/corem/core/src/account.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- account.c 2000/11/20 10:02:03 1.4
+++ account.c 2000/11/20 21:02:13 1.5
@@ -160,77 +160,77 @@
* Returns: nothing
*/
-Account *account_read(gchar *path)
+Account *account_read(gchar * path)
{
FILE *fp;
- gchar *line;
- Account *acct;
+ gchar *line;
+ Account *acct;
- fp = fopen(path, "r");
+ fp = fopen(path, "r");
if (fp == NULL) {
perror("fopen");
return NULL;
- }
+ }
- acct = new_account();
+ acct = new_account();
-
+
while ((line = get_next_line(fp)) != NULL) {
- if (g_strncasecmp(line, "account_name=", 13) == 0)
+ if (g_strncasecmp(line, "account_name=", 13) == 0)
account_set_name(acct, line + 13);
else if (g_strncasecmp(line, "smtp_server=", 12) == 0)
account_set_server(acct, line + 12);
- else if (g_strncasecmp(line, "full_name=", 10) == 0)
+ else if (g_strncasecmp(line, "full_name=", 10) == 0)
account_set_fullname(acct, line + 10);
- else if (g_strncasecmp(line, "path=", 5) == 0)
+ else if (g_strncasecmp(line, "path=", 5) == 0)
account_set_path(acct, line + 5);
- else if (g_strncasecmp(line, "email_address=", 14) == 0)
+ else if (g_strncasecmp(line, "email_address=", 14) == 0)
account_set_address(acct, line + 14);
- }
+ }
- return acct;
+ return acct;
}
Account *get_next_folder()
{
- struct stat file_stat;
- struct dirent *dentry = NULL;
- char *temp = NULL;
- char *path = NULL;
- Account *mbox = NULL;
-
- temp = g_strdup(getenv("HOME"));
- if (!temp)
- return NULL;
-
- asprintf(&path, "%s/.core/accounts", temp);
- if (!path)
- return NULL;
- g_free(temp);
-
- if (!acct_dir)
- acct_dir = opendir(path);
-
- if (!acct_dir) {
- perror("opendir");
- return NULL;
- }
-
- while ((dentry = readdir(acct_dir)) != NULL) {
-
- asprintf(&temp, "%s/%s", path, dentry->d_name);
- if (!temp)
- break;
-
- if (stat(temp, &file_stat) < 0)
- break;
-
- if (S_ISREG(file_stat.st_mode))
- mbox = account_read(temp);
-
- /* g_free(dentry); */
- g_free(temp);
- }
+ struct stat file_stat;
+ struct dirent *dentry = NULL;
+ char *temp = NULL;
+ char *path = NULL;
+ Account *mbox = NULL;
+
+ temp = g_strdup(getenv("HOME"));
+ if (!temp)
+ return NULL;
+
+ asprintf(&path, "%s/.core/accounts", temp);
+ if (!path)
+ return NULL;
+ g_free(temp);
+
+ if (!acct_dir)
+ acct_dir = opendir(path);
+
+ if (!acct_dir) {
+ perror("opendir");
+ return NULL;
+ }
+
+ while ((dentry = readdir(acct_dir)) != NULL) {
+
+ asprintf(&temp, "%s/%s", path, dentry->d_name);
+ if (!temp)
+ break;
+
+ if (stat(temp, &file_stat) < 0)
+ break;
+
+ if (S_ISREG(file_stat.st_mode))
+ mbox = account_read(temp);
+
+ /* g_free(dentry); */
+ g_free(temp);
+ }
return mbox;
}
===================================================================
RCS file: /cvsroot/corem/core/src/account.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- account.h 2000/11/14 22:07:28 1.2
+++ account.h 2000/11/20 21:02:13 1.3
@@ -3,7 +3,7 @@
char *name;
char *address;
char *server;
- char *path;
+ char *path;
FILE *fp;
} Account;
@@ -26,5 +26,5 @@
char *account_get_name(Account * ac);
int account_set_name(Account * ac, char *path);
-Account *account_read(gchar *path);
+Account *account_read(gchar * path);
Account *get_next_folder(void);
===================================================================
RCS file: /cvsroot/corem/core/src/callbacks.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- callbacks.c 2000/11/20 10:02:03 1.14
+++ callbacks.c 2000/11/20 21:02:13 1.15
@@ -20,9 +20,9 @@
GtkWidget *main_vbox, *vbox;
GtkWidget *hbutton_box;
GtkWidget *button_new, *button_edit, *button_remove, *button_close;
- gchar *titles[] =
- { "Folder Name", "Full Name", "E-mail Address",
- "Mailbox Path" };
+ gchar *titles[] = { "Folder Name", "Full Name", "E-mail Address",
+ "Mailbox Path"
+ };
title = g_strdup_printf("Accounts");
@@ -42,7 +42,8 @@
gtk_container_add(GTK_CONTAINER(vbox), clist);
hbutton_box = gtk_hbutton_box_new();
- gtk_box_pack_start(GTK_BOX(main_vbox), hbutton_box, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(main_vbox), hbutton_box, FALSE, FALSE,
+ 0);
button_new = gtk_button_new_with_label("New");
gtk_widget_set_usize(GTK_WIDGET(button_new), 55, 22);
@@ -64,8 +65,9 @@
gtk_widget_set_usize(GTK_WIDGET(button_remove), 55, 22);
gtk_container_add(GTK_CONTAINER(hbutton_box), button_remove);
- hbutton_box = gtk_hbutton_box_new();
- gtk_box_pack_start(GTK_BOX(main_vbox), hbutton_box, FALSE, FALSE, 0);
+ hbutton_box = gtk_hbutton_box_new();
+ gtk_box_pack_start(GTK_BOX(main_vbox), hbutton_box, FALSE, FALSE,
+ 0);
button_close = gtk_button_new_with_label("Close");
gtk_signal_connect_object(GTK_OBJECT(button_close), "clicked",
@@ -99,86 +101,87 @@
gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 0);
gtk_container_add(GTK_CONTAINER(accounts_win_new), main_vbox);
- table = gtk_table_new(4, 2, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
- gtk_box_pack_start(GTK_BOX(main_vbox), table, FALSE, FALSE, 4);
+ table = gtk_table_new(4, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 2);
+ gtk_box_pack_start(GTK_BOX(main_vbox), table, FALSE, FALSE, 4);
label = gtk_label_new("Folder Name:");
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0,
- 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
folder_name = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(folder_name), 200, 20);
- gtk_table_attach(GTK_TABLE(table), folder_name, 1, 2, 0,
- 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), folder_name, 1, 2, 0,
+ 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
label = gtk_label_new("Full Name:");
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1,
- 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1,
+ 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
full_name = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(full_name), 200, 20);
- gtk_table_attach(GTK_TABLE(table), full_name, 1, 2, 1,
- 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), full_name, 1, 2, 1,
+ 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
label = gtk_label_new("E-mail Address:");
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2,
- 3, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2,
+ 3, GTK_EXPAND | GTK_FILL, 0, 1, 1);
email_address = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(email_address), 200, 20);
- gtk_table_attach(GTK_TABLE(table), email_address, 1, 2, 2,
- 3, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), email_address, 1, 2, 2,
+ 3, GTK_EXPAND | GTK_FILL, 0, 1, 1);
- table = gtk_table_new(2, 4, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
- gtk_box_pack_start(GTK_BOX(main_vbox), table, FALSE, FALSE, 4);
+ table = gtk_table_new(2, 4, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(table), 2);
+ gtk_box_pack_start(GTK_BOX(main_vbox), table, FALSE, FALSE, 4);
label = gtk_label_new("Username:");
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0,
- 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0,
+ 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
username = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(username), 100, 20);
- gtk_table_attach(GTK_TABLE(table), username, 1, 2, 0,
- 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), username, 1, 2, 0,
+ 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
label = gtk_label_new("Password:");
- gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0,
- 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0,
+ 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
password = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(password), 100, 20);
- gtk_table_attach(GTK_TABLE(table), password, 3, 4, 0,
- 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), password, 3, 4, 0,
+ 1, GTK_EXPAND | GTK_FILL, 0, 1, 1);
label = gtk_label_new("Server:");
- gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1,
- 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1,
+ 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
server = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(server), 100, 20);
- gtk_table_attach(GTK_TABLE(table), server, 1, 2, 1,
- 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), server, 1, 2, 1,
+ 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
label = gtk_label_new("Path:");
- gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1,
- 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1,
+ 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
path = gtk_entry_new();
gtk_widget_set_usize(GTK_WIDGET(path), 100, 20);
- gtk_table_attach(GTK_TABLE(table), path, 3, 4, 1,
- 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
+ gtk_table_attach(GTK_TABLE(table), path, 3, 4, 1,
+ 2, GTK_EXPAND | GTK_FILL, 0, 1, 1);
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 0);
gtk_box_pack_start(GTK_BOX(main_vbox), hbox, TRUE, TRUE, 0);
sep1 = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(main_vbox), sep1, TRUE, TRUE, 0);
- hbutton_box = gtk_hbutton_box_new();
- gtk_box_pack_start(GTK_BOX(main_vbox), hbutton_box, FALSE, FALSE, 0);
+ hbutton_box = gtk_hbutton_box_new();
+ gtk_box_pack_start(GTK_BOX(main_vbox), hbutton_box, FALSE, FALSE,
+ 0);
button_save = gtk_button_new_with_label("Save");
gtk_widget_set_usize(GTK_WIDGET(button_save), 55, 22);
@@ -201,47 +204,47 @@
void account_write()
{
/*FILE *account;
- gchar *account_file;
- gchar *acct_name, *fullname, *email, *spool, *pop, *smtp;
-
- acct_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(account_name)));
- fullname = g_strdup(gtk_entry_get_text(GTK_ENTRY(full_name)));
- email = g_strdup(gtk_entry_get_text(GTK_ENTRY(email_address)));
- if (type == 0)
- spool = g_strdup(gtk_entry_get_text(GTK_ENTRY(spoolfile)));
- if (type == 1)
- pop = g_strdup(gtk_entry_get_text(GTK_ENTRY(popserver)));
- mtp = g_strdup(gtk_entry_get_text(GTK_ENTRY(smtpserver)));
-
- account_file =
- g_strconcat(getenv("HOME"), "/.core/accounts/", acct_name, NULL);
-
- if (g_strcasecmp(acct_name, "") == 0) {
- g_print("ERROR: You must specify a account name");
- return;
- }
+ gchar *account_file;
+ gchar *acct_name, *fullname, *email, *spool, *pop, *smtp;
- account = fopen(account_file, "w");
- if (account == NULL) {
- fprintf(account, "ERROR: Cannot write to account file\n");
- return;
- }
+ acct_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(account_name)));
+ fullname = g_strdup(gtk_entry_get_text(GTK_ENTRY(full_name)));
+ email = g_strdup(gtk_entry_get_text(GTK_ENTRY(email_address)));
+ if (type == 0)
+ spool = g_strdup(gtk_entry_get_text(GTK_ENTRY(spoolfile)));
+ if (type == 1)
+ pop = g_strdup(gtk_entry_get_text(GTK_ENTRY(popserver)));
+ mtp = g_strdup(gtk_entry_get_text(GTK_ENTRY(smtpserver)));
+
+ account_file =
+ g_strconcat(getenv("HOME"), "/.core/accounts/", acct_name, NULL);
+
+ if (g_strcasecmp(acct_name, "") == 0) {
+ g_print("ERROR: You must specify a account name");
+ return;
+ }
+
+ account = fopen(account_file, "w");
+ if (account == NULL) {
+ fprintf(account, "ERROR: Cannot write to account file\n");
+ return;
+ }
+
+ if (type == 0)
+ fprintf(account, "account_type=mbox\n");
+ if (type == 1)
+ fprintf(account, "account_type=pop3\n");
+ fprintf(account, "account_name=%s\n", acct_name);
+ fprintf(account, "full_name=%s\n", fullname);
+ fprintf(account, "email_address=%s\n", email);
+ if (type == 0)
+ fprintf(account, "spoolfile=%s\n", spool);
+ if (type == 1)
+ fprintf(account, "popserver=%s\n", pop);
+ fprintf(account, "smtpserver=%s\n", smtp);
- if (type == 0)
- fprintf(account, "account_type=mbox\n");
- if (type == 1)
- fprintf(account, "account_type=pop3\n");
- fprintf(account, "account_name=%s\n", acct_name);
- fprintf(account, "full_name=%s\n", fullname);
- fprintf(account, "email_address=%s\n", email);
- if (type == 0)
- fprintf(account, "spoolfile=%s\n", spool);
- if (type == 1)
- fprintf(account, "popserver=%s\n", pop);
- fprintf(account, "smtpserver=%s\n", smtp);
-
- gtk_widget_destroy(accounts_win_new);
- return;*/
+ gtk_widget_destroy(accounts_win_new);
+ return; */
}
void create_core_about_window(void)
@@ -360,18 +363,17 @@
}
int folder_selected(GtkWidget * list, GList * node, gint col,
- gpointer data)
+ gpointer data)
{
Message *message = NULL;
Account *mbox = NULL;
- char *text[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+ gchar *text[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
mbox = (Account *) gtk_ctree_node_get_row_data(GTK_CTREE(list),
GTK_CTREE_NODE
(node));
-
title =
- g_strdup_printf("Core %d.%d.%d: Inbox", CORE_MAJOR,
+ g_strdup_printf("Core %d.%d.%d", CORE_MAJOR,
CORE_MINOR, CORE_MICRO);
gtk_window_set_title(GTK_WINDOW(main_win), title);
while (1) {
@@ -469,9 +471,9 @@
free(temp);
item =
- gtk_ctree_insert_node(GTK_CTREE(mail_ctree), top, NULL,
- text, 0, NULL, NULL, NULL, NULL,
- FALSE, TRUE);
+ gtk_ctree_insert_node(GTK_CTREE(mail_ctree), NULL,
+ NULL, text, 0, NULL, NULL, NULL,
+ NULL, FALSE, TRUE);
temp = header_get_value(find_header(head, "Message-Id:"));
if (temp)
@@ -485,11 +487,16 @@
current_mbox = mbox;
return TRUE;
+ data = NULL;
}
-int folder_unselected( /*GtkWidget * list, GList * node, gint col,
- gpointer data */ )
+int folder_unselected(GtkWidget * list, GList * node, gint col,
+ gpointer data)
{
+ list = NULL;
+ node = NULL;
+ col = 0;
+ data = NULL;
return TRUE;
}
===================================================================
RCS file: /cvsroot/corem/core/src/callbacks.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- callbacks.h 2000/11/20 10:02:03 1.4
+++ callbacks.h 2000/11/20 21:02:13 1.5
@@ -14,9 +14,9 @@
void create_mail_menu(GtkWidget * window, GtkWidget ** menubar);
int folder_selected(GtkWidget * list, GList * node, gint col,
- gpointer data);
-int folder_unselected( /*GtkWidget * list, GList * node, gint col,
- gpointer data */ );
+ gpointer data);
+int folder_unselected(GtkWidget * list, GList * node, gint col,
+ gpointer data);
int mail_selected(GtkWidget * list, GList * node, gint col, gpointer data);
int mail_unselected(GtkWidget * list, GList * node, gint col,
===================================================================
RCS file: /cvsroot/corem/core/src/panes.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- panes.c 2000/11/14 19:38:44 1.3
+++ panes.c 2000/11/20 21:02:13 1.4
@@ -35,6 +35,8 @@
folder_ctree = gtk_ctree_new_with_titles(3, 0, folder_titles);
gtk_signal_connect(GTK_OBJECT(folder_ctree), "tree_select_row",
GTK_SIGNAL_FUNC(folder_selected), NULL);
+ gtk_signal_connect(GTK_OBJECT(folder_ctree), "tree_unselect_row",
+ GTK_SIGNAL_FUNC(folder_unselected), NULL);
if (!text || !text[0] || !text[1] || !text[2]) {
fprintf(stderr, "ERROR: Malloc failed, Exiting....\n");
@@ -213,12 +215,12 @@
if (config.ml_from == 1) {
gtk_clist_set_column_width(GTK_CLIST(mail_ctree), ifrom,
- 150);
+ 250);
}
if (config.ml_subject == 1) {
gtk_clist_set_column_width(GTK_CLIST(mail_ctree), isubject,
- 175);
+ 125);
}
if (config.ml_date == 1) {
===================================================================
RCS file: /cvsroot/corem/core/src/prefs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- prefs.c 2000/11/20 10:02:03 1.3
+++ prefs.c 2000/11/20 21:02:13 1.4
@@ -295,18 +295,18 @@
g_strdup_printf("Core %d.%d.%d", CORE_MAJOR, CORE_MINOR,
CORE_MICRO));
gtk_signal_connect(GTK_OBJECT
- (GTK_FONT_SELECTION_DIALOG(fontsel)->
- cancel_button), "clicked",
+ (GTK_FONT_SELECTION_DIALOG
+ (fontsel)->cancel_button), "clicked",
GTK_SIGNAL_FUNC(gtk_widget_destroy), fontsel);
gtk_signal_connect(GTK_OBJECT
(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button),
"clicked", GTK_SIGNAL_FUNC(set_font), fontsel);
gtk_object_set_data(GTK_OBJECT
- (GTK_FONT_SELECTION_DIALOG(fontsel)->
- ok_button), "entry", entry);
+ (GTK_FONT_SELECTION_DIALOG
+ (fontsel)->ok_button), "entry", entry);
gtk_widget_hide(GTK_WIDGET
- (GTK_FONT_SELECTION_DIALOG(fontsel)->
- apply_button));
+ (GTK_FONT_SELECTION_DIALOG
+ (fontsel)->apply_button));
gtk_widget_show(fontsel);
return;
button = NULL;
|
