From 8cb514d6dd9497893a35a089d07a132d51263ee7 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Thu, 10 Aug 2000 17:30:50 +0000 Subject: Merge with camel-async. svn path=/trunk/; revision=4687 --- shell/ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'shell/ChangeLog') diff --git a/shell/ChangeLog b/shell/ChangeLog index 56dd6665a4..f160418e7d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -148,6 +148,17 @@ (e_shell_folder_title_bar_set_title): Set both `label' and `button_label'. +2000-07-21 Peter Williams + + * evolution-shell-client.c (user_select_folder): Don't use + g_main_loop to block the caller; this will break when + threads are enabled and GDK_THREADS_ENTER deadlocks. Use + gtk_main / gtk_main_exit to enter and exit the main loop, + which handles the recursive case correctly. + (impl_FolderSelectionListener_selected): Same. + (impl_FolderSelectionListener_cancel): Same. + (struct _FolderSelectionListenerServant): No more main_loop member. + 2000-07-21 Ettore Perazzoli * e-shell-view.c (storage_set_view_box_button_release_event_cb): -- cgit