aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/folder-browser-factory.c7
2 files changed, 8 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c881e7dd43..13c5e1655a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2000-07-10 Dan Winship <danw@helixcode.com>
+ * folder-browser-factory.c (control_activate): Work with both
+ current and 0.15 bonobo
+
* kill more debugging messages
* mail-ops.c (real_fetch_mail): Don't multiply free dest_url.
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 80ce55f281..7eb3894a2d 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -68,8 +68,11 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
threaded_view);
bonobo_ui_handler_menu_set_callback (uih, "/View/Threaded",
message_list_toggle_threads,
- FOLDER_BROWSER (folder_browser)->message_list,
- NULL);
+ FOLDER_BROWSER (folder_browser)->message_list
+#ifdef BONOBO_POST_0_15
+ , NULL
+#endif
+ );
bonobo_ui_handler_menu_new_item (uih, "/Actions/Expunge", N_("_Expunge"),
NULL, -1,