From 88be013ed7fd56d2bb2a48e497bad0bc9473574e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 4 Jun 2024 11:59:01 +0200 Subject: [PATCH] I#2773 - Unable to drag'n'drop attachments between attachment bars Replace leftover usages of gtk_main_iteration(), which should not be used since move away from gtk_main() in commit https://gitlab.gnome.org/GNOME/evolution/-/commit/21c3e2346bc194b110268975102f995fd930e9bf . Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2773 --- src/e-util/e-attachment-view.c | 3 +-- src/mail/e-mail-migrate.c | 2 +- src/modules/itip-formatter/itip-view.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/e-util/e-attachment-view.c b/src/e-util/e-attachment-view.c index d7d9efc44d..5565ce6133 100644 --- a/src/e-util/e-attachment-view.c +++ b/src/e-util/e-attachment-view.c @@ -1978,8 +1978,7 @@ e_attachment_view_drag_data_get (EAttachmentView *view, /* We can't return until we have results, so crank * the main loop until the callback gets triggered. */ while (!status.done) - if (gtk_main_iteration ()) - break; + g_main_context_iteration (NULL, TRUE); if (status.uris) { gtk_selection_data_set_uris (selection, status.uris); diff --git a/src/mail/e-mail-migrate.c b/src/mail/e-mail-migrate.c index e0c9f6d54b..2998045506 100644 --- a/src/mail/e-mail-migrate.c +++ b/src/mail/e-mail-migrate.c @@ -68,7 +68,7 @@ em_migrate_set_progress (double percent) gtk_progress_bar_set_text (progress, text); while (gtk_events_pending ()) - gtk_main_iteration (); + g_main_context_iteration (NULL, TRUE); } enum { diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c index 4c17f82db6..558162b2c1 100644 --- a/src/modules/itip-formatter/itip-view.c +++ b/src/modules/itip-formatter/itip-view.c @@ -5144,7 +5144,7 @@ get_uri_for_part (CamelMimePart *mime_part) * loop until the callback gets triggered. */ /* coverity[loop_condition] */ while (!status.done) - gtk_main_iteration (); + g_main_context_iteration (NULL, TRUE); status.file = NULL; status.done = FALSE; @@ -5157,7 +5157,7 @@ get_uri_for_part (CamelMimePart *mime_part) * the main loop until the callback gets triggered. */ /* coverity[loop_condition] */ while (!status.done) - gtk_main_iteration (); + g_main_context_iteration (NULL, TRUE); if (status.file != NULL) { path = g_file_get_path (status.file);