aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-folder-view.c5
2 files changed, 9 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9bf1bd045d..9150bf2529 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2006-01-02 Harish Krishnaswamy <kharish@novell.com>
+ * em-folder-view.c: (emfv_setting_notify):
+ Remove the first check in the previous commit.
+ This is redundant as it is always guaranteed
+ that the component has been activated at this point.
+ And when not, it ought to crash :-).
+
+2006-01-02 Harish Krishnaswamy <kharish@novell.com>
+
reviewed by: Parthasarathi <sparthasarathi@novell.com>
* em-folder-view.c: (emfv_setting_notify):
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index b90d974655..7acbc6d3e1 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -2707,10 +2707,7 @@ 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);
- /* 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);
+ bonobo_ui_component_set_prop (emfv->uic, "/commands/ViewPreview", "state", state_gconf ? "1" : "0", NULL);
break; }
case EMFV_SHOW_DELETED: {
gboolean state;