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 /smclient | |
| parent | 74d33d365d99684b279088f2a24b53896b51f899 (diff) | |
| download | gsoc2013-evolution-07be2453e059c1cf0a5a2f8f7883e7de84411e97.tar.gz 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 'smclient')
| -rw-r--r-- | smclient/eggsmclient-win32.c | 6 | ||||
| -rw-r--r-- | smclient/eggsmclient-xsmp.c | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/smclient/eggsmclient-win32.c b/smclient/eggsmclient-win32.c index b404a490cc..5176a6c592 100644 --- a/smclient/eggsmclient-win32.c +++ b/smclient/eggsmclient-win32.c @@ -182,9 +182,7 @@ sm_client_win32_end_session (EggSMClient *client, static gboolean emit_quit_requested (gpointer smclient) { - gdk_threads_enter (); egg_sm_client_quit_requested (smclient); - gdk_threads_leave (); return FALSE; } @@ -194,9 +192,7 @@ emit_quit (gpointer smclient) { EggSMClientWin32 *win32 = smclient; - gdk_threads_enter (); egg_sm_client_quit (smclient); - gdk_threads_leave (); SetEvent (win32->response_event); return FALSE; @@ -207,9 +203,7 @@ emit_quit_cancelled (gpointer smclient) { EggSMClientWin32 *win32 = smclient; - gdk_threads_enter (); egg_sm_client_quit_cancelled (smclient); - gdk_threads_leave (); SetEvent (win32->response_event); return FALSE; diff --git a/smclient/eggsmclient-xsmp.c b/smclient/eggsmclient-xsmp.c index 3622d95d89..dcaa574690 100644 --- a/smclient/eggsmclient-xsmp.c +++ b/smclient/eggsmclient-xsmp.c @@ -379,9 +379,7 @@ sm_client_xsmp_startup (EggSMClient *client, xsmp->client_id = g_strdup (ret_client_id); free (ret_client_id); - gdk_threads_enter (); gdk_x11_set_sm_client_id (xsmp->client_id); - gdk_threads_leave (); g_debug ("Got client ID \"%s\"", xsmp->client_id); } @@ -552,8 +550,6 @@ idle_do_pending_events (gpointer data) EggSMClientXSMP *xsmp = data; EggSMClient *client = data; - gdk_threads_enter (); - xsmp->idle = 0; if (xsmp->waiting_to_emit_quit) @@ -577,7 +573,6 @@ idle_do_pending_events (gpointer data) } out: - gdk_threads_leave (); return FALSE; } @@ -1308,9 +1303,7 @@ process_ice_messages (IceConn ice_conn) { IceProcessMessagesStatus status; - gdk_threads_enter (); status = IceProcessMessages (ice_conn, NULL, NULL); - gdk_threads_leave (); switch (status) { |