aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/message-list.c21
2 files changed, 15 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 55655e16d5..2616df2df3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-13 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * message-list.c (message_list_setup_etable): Don't free the
+ service name.
+
2000-10-12 Jeffrey Stedfast <fejj@helixcode.com>
* mail-ops.c (do_fetch_mail): sync & expunge the source folder
diff --git a/mail/message-list.c b/mail/message-list.c
index 4fbc13bb74..bbcada7630 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -936,17 +936,17 @@ message_list_setup_etable(MessageList *message_list)
char *name;
char *path;
struct stat st;
-
- path = mail_config_folder_to_cachename(message_list->folder, "et-header-");
- if (stat(path, &st) == 0 && st.st_size > 0 && S_ISREG(st.st_mode)) {
- e_table_scrolled_load_state(E_TABLE_SCROLLED(message_list->etable), path);
+
+ path = mail_config_folder_to_cachename (message_list->folder, "et-header-");
+ if (path && stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
+ e_table_scrolled_load_state (E_TABLE_SCROLLED (message_list->etable), path);
} else {
/* I wonder if there's a better way to do this ...? */
- name = camel_service_get_name((CAMEL_SERVICE(message_list->folder->parent_store)), TRUE);
- printf("folder name is '%s'\n", name);
- if (strstr(name, "/Drafts") != NULL
- || strstr(name, "/Outbox") != NULL
- || strstr(name, "/Sent") != NULL) {
+ name = camel_service_get_name (CAMEL_SERVICE (message_list->folder->parent_store), TRUE);
+ printf ("folder name is '%s'\n", name);
+ if (strstr (name, "/Drafts") != NULL
+ || strstr (name, "/Outbox") != NULL
+ || strstr (name, "/Sent") != NULL) {
ETableExtras *extras;
char *spec;
@@ -960,9 +960,8 @@ message_list_setup_etable(MessageList *message_list)
gtk_object_sink (GTK_OBJECT (extras));
g_free (spec);
}
- g_free(name);
}
- g_free(path);
+ g_free (path);
}
}