one-line fix for bug #2536: File->Close in message viewer doesn't work.

2001-05-29  Jason Leach  <jleach@ximian.com>

	* message-browser.c (message_browser_new): one-line fix for bug
	#2536: File->Close in message viewer doesn't work.
	(message_browser_new): Also replaced like 4 lines of code with a
	one-liner featuring gnome_app_create_toolbar_with_data().

	2001-05-28  Jason Leach  <jleach@ximian.com>

	* mail-local.c (load_metainfo): Don't need to check if (foo!=NULL)
	before doing an xmlFreeDoc().

svn path=/trunk/; revision=10039

3 files changed, 17 insertions, 11 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index a685ad6b77..67cdf4160b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2001-05-29  Jason Leach  <jleach@ximian.com>
+
+	* message-browser.c (message_browser_new): one-line fix for bug
+	#2536: File->Close in message viewer doesn't work.
+	(message_browser_new): Also replaced like 4 lines of code with a
+	one-liner featuring gnome_app_create_toolbar_with_data().
+
+2001-05-28  Jason Leach  <jleach@ximian.com>
+
+	* mail-local.c (load_metainfo): Don't need to check if (foo!=NULL)
+	before doing an xmlFreeDoc().
+
 2001-05-28  Dan Winship  <danw@ximian.com>
 
 	* mail-format.c (write_text_header): Fix a bug that could cause a
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 0805fd38a2..570fc9847b 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -129,8 +129,7 @@ load_metainfo(const char *path)
 	meta->format = g_strdup("mbox"); /* defaults */
 	meta->name = g_strdup("mbox");
 	meta->indexed = TRUE;
-	if (doc)
-		xmlFreeDoc(doc);
+	xmlFreeDoc(doc);
 	return meta;
 }
 
diff --git a/mail/message-browser.c b/mail/message-browser.c
index 8bd4470235..f3de72806a 100644
--- a/mail/message-browser.c
+++ b/mail/message-browser.c
@@ -256,7 +256,7 @@ set_default_size (GtkWidget *widget)
 GtkWidget *
 message_browser_new (const GNOME_Evolution_Shell shell, const char *uri, const char *uid)
 {
-	GtkWidget *toolbar, *vbox;
+	GtkWidget *vbox;
 	MessageBrowser *new;
 	FolderBrowser *fb;
 	
@@ -265,14 +265,9 @@ message_browser_new (const GNOME_Evolution_Shell shell, const char *uri, const c
 	gnome_app_construct (GNOME_APP (new), "Evolution", "");
 	
 	gtk_object_set_data_full (GTK_OBJECT (new), "uid", g_strdup (uid), g_free);
-	
-	toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
-	gnome_app_fill_toolbar_with_data (GTK_TOOLBAR (toolbar),
-					  message_browser_toolbar,
-					  NULL, new);
-	
-	gnome_app_set_toolbar (GNOME_APP (new), GTK_TOOLBAR (toolbar));
-	gnome_app_create_menus (GNOME_APP (new), message_browser_menubar);
+
+	gnome_app_create_toolbar_with_data (GNOME_APP (new), message_browser_toolbar, new);
+	gnome_app_create_menus_with_data (GNOME_APP (new), message_browser_menubar, new);
 	
 	fb = FOLDER_BROWSER (folder_browser_new (shell));
 	new->fb = fb;