Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3806
diff -u -p -r1.3806 ChangeLog
--- ChangeLog	20 Feb 2006 16:01:00 -0000	1.3806
+++ ChangeLog	21 Feb 2006 13:06:26 -0000
@@ -1,3 +1,10 @@
+2006-02-20  Veerapuram Varadhan <vvaradhan@novell.com>
+
+	** Fixes bug #325550
+
+	* em-folder-view.c (emfv_setting_notify): Check emfv->uic for
+	NULL, before calling bonobo_ui_component_set_prop().
+	
 2006-02-20  Srinivasa Ragavan <sragavan@novell.com>
 
 	** Fixes bug #322160 and committed for PRSuman.
Index: em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.145
diff -u -p -r1.145 em-folder-view.c
--- em-folder-view.c	8 Feb 2006 11:51:32 -0000	1.145
+++ em-folder-view.c	21 Feb 2006 13:06:26 -0000
@@ -2701,7 +2701,8 @@ emfv_setting_notify(GConfClient *gconf, 
 		if (camel_object_meta_set (emfv->folder, "evolution:show_preview", state_gconf ? "1" : "0"))
 			camel_object_state_write (emfv->folder);
 		em_folder_browser_show_preview ((EMFolderBrowser *)emfv, state_gconf);
-		bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewPreview", "state", state_gconf ? "1" : "0", NULL);
+		if (emfv->uic)
+			bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewPreview", "state", state_gconf ? "1" : "0", NULL);
 		break; }
 	case EMFV_SHOW_DELETED: { 
 		gboolean state;
@@ -2732,7 +2733,8 @@ emfv_setting_notify(GConfClient *gconf, 
 		if (camel_object_meta_set (emfv->folder, "evolution:thread_list", state_gconf ? "1" : "0"))
 			camel_object_state_write (emfv->folder);
 		message_list_set_threaded (emfv->list, state_gconf);
-		bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewThreaded", "state", state_gconf ? "1" : "0", NULL);
+		if (emfv->uic)
+			bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewThreaded", "state", state_gconf ? "1" : "0", NULL);
 		break; }
 	case EMFV_PANED_SIZE: {
 		EMFolderBrowser *emfb = (EMFolderBrowser *)emfv;
