aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-folder-tree-model.c2
-rw-r--r--mail/mail-errors.xml.h6
3 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 97a64fff60..c2b24be771 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21 David Malcolm <dmalcolm@redhat.com>
+
+ * em-folder-tree-model.c (em_folder_tree_model_set_selected): Fix
+ a typo setting the root node.
+
2004-09-09 Jeffrey Stedfast <fejj@novell.com>
* em-message-browser.c (emmb_set_message): Ignore the
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 4f1a8dda67..15be6d5cfb 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -1146,7 +1146,7 @@ em_folder_tree_model_set_selected (EMFolderTreeModel *model, const char *uri)
if (!model->state->children) {
root = xmlNewDocNode (model->state, NULL, "tree-state", NULL);
- xmlDocSetRootElement (model->state, node);
+ xmlDocSetRootElement (model->state, root);
} else {
root = model->state->children;
}
diff --git a/mail/mail-errors.xml.h b/mail/mail-errors.xml.h
index 74cdecfc92..52c4ece276 100644
--- a/mail/mail-errors.xml.h
+++ b/mail/mail-errors.xml.h
@@ -230,6 +230,12 @@ char *s = N_("A non-empty folder at \"{1}\" already exists.\n"
char *s = N_("Ignore");
char *s = N_("_Overwrite");
char *s = N_("_Append");
+/* mail:no-load-license primary */
+char *s = N_("Unable to read license file.");
+/* mail:no-load-license secondary */
+char *s = N_("Cannot read the license file \"{0}\", due to an\n"
+ " installation problem. You will not be able to use this provider until\n"
+ " you can accept its license.");
/* mail:gw-accountsetup-error primary */
char *s = N_("Unable to connect to the GroupWise\n"
"server.");