diff options
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-selection.c | 15 | ||||
| -rw-r--r-- | e-util/e-util.c | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/e-util/e-selection.c b/e-util/e-selection.c index 1c5d11b6e4..041b30c4f2 100644 --- a/e-util/e-selection.c +++ b/e-util/e-selection.c @@ -704,11 +704,8 @@ e_clipboard_wait_for_calendar (GtkClipboard *clipboard) clipboard, (GtkClipboardTextReceivedFunc) clipboard_wait_for_text_cb, &results); - if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + if (g_main_loop_is_running (results.loop)) g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); - } g_main_loop_unref (results.loop); @@ -729,11 +726,8 @@ e_clipboard_wait_for_directory (GtkClipboard *clipboard) clipboard, (GtkClipboardTextReceivedFunc) clipboard_wait_for_text_cb, &results); - if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + if (g_main_loop_is_running (results.loop)) g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); - } g_main_loop_unref (results.loop); @@ -754,11 +748,8 @@ e_clipboard_wait_for_html (GtkClipboard *clipboard) clipboard, (GtkClipboardTextReceivedFunc) clipboard_wait_for_text_cb, &results); - if (g_main_loop_is_running (results.loop)) { - GDK_THREADS_LEAVE (); + if (g_main_loop_is_running (results.loop)) g_main_loop_run (results.loop); - GDK_THREADS_ENTER (); - } g_main_loop_unref (results.loop); diff --git a/e-util/e-util.c b/e-util/e-util.c index a2221a332a..4f9983cfcc 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -129,7 +129,7 @@ window_configure_event_cb (GtkWindow *window, if (data->timeout_id > 0) g_source_remove (data->timeout_id); - data->timeout_id = gdk_threads_add_timeout_seconds ( + data->timeout_id = g_timeout_add_seconds ( 1, (GSourceFunc) window_update_settings, data); return FALSE; |