diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d17da724d4..9bf1bd045d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2006-01-02 Harish Krishnaswamy <kharish@novell.com> + + reviewed by: Parthasarathi <sparthasarathi@novell.com> + + * em-folder-view.c: (emfv_setting_notify): + Set the properties on the bonobo component only if + it already has been activated. Fixes #325375 (critical + warning crasher). + 2006-01-01 Changwoo Ryu <cwryu@debian.org> * em-folder-properties.c (emfp_dialog_got_folder): translate diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 4d0e964019..b90d974655 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2707,14 +2707,20 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold 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); + /* Set the prop only if the component has already been + * activated. */ + if (emfv->uic) + bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewPreview", "state", state_gconf ? "1" : "0", NULL); break; } - case EMFV_SHOW_DELETED: { + case EMFV_SHOW_DELETED: { gboolean state; state = gconf_value_get_bool (value); em_folder_view_set_hide_deleted (emfv, !state); - bonobo_ui_component_set_prop (emfv->uic, "/commands/HideDeleted", "state", state ? "0" : "1", NULL); + /* Set the prop only if the component has already been + * activated. */ + if (emfv->uic) + bonobo_ui_component_set_prop (emfv->uic, "/commands/HideDeleted", "state", state ? "0" : "1", NULL); break; } case EMFV_THREAD_LIST: { gboolean state_gconf, state_camel; |