diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-08-06 08:59:18 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-08-06 10:12:26 +0800 |
| commit | 07be2453e059c1cf0a5a2f8f7883e7de84411e97 (patch) | |
| tree | a35669cf5ea51b57da5635b0fdc30ee81f488c5f /e-util | |
| parent | 74d33d365d99684b279088f2a24b53896b51f899 (diff) | |
| download | gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar.gz gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar.bz2 gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar.lz gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar.xz gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar.zst gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.zip | |
Remove all GDK threads usage.
According to [1], we don't need to worry about GDK's global lock since
we don't call gdk_threads_init() or gdk_threads_set_lock_functions().
The GDK threads API is being aggressively deprecated by GTK+ developers
so let's just abandon it entirely. I've never really understood when
you're supposed to use it or not use it anyway, so it's good to be rid
of this confusion.
[1] https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00005.html
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; |