gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

GTK3: don't use deprecated gdk_threads_{enter/leave} () 

Since we don't ever call gdk_threads_init()
master-1.22
raveit65 2016-03-09 22:55:34 +01:00
parent 609f972e66
commit 5102ba128c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/eggsmclient-xsmp.c
View File

@ -376,13 +376,13 @@ sm_client_xsmp_startup (EggSMClient *client,
xsmp->client_id = g_strdup (ret_client_id); xsmp->client_id = g_strdup (ret_client_id);
free (ret_client_id); free (ret_client_id);
gdk_threads_enter ();
#if GTK_CHECK_VERSION (3, 0, 0) #if GTK_CHECK_VERSION (3, 0, 0)
gdk_x11_set_sm_client_id (xsmp->client_id); gdk_x11_set_sm_client_id (xsmp->client_id);
#else #else
gdk_threads_enter ();
gdk_set_sm_client_id (xsmp->client_id); gdk_set_sm_client_id (xsmp->client_id);
#endif
gdk_threads_leave (); gdk_threads_leave ();
#endif
g_debug ("Got client ID \"%s\"", xsmp->client_id); g_debug ("Got client ID \"%s\"", xsmp->client_id);
} }
@ -568,7 +568,9 @@ idle_do_pending_events (gpointer data)
EggSMClientXSMP *xsmp = data; EggSMClientXSMP *xsmp = data;
EggSMClient *client = data; EggSMClient *client = data;
#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_enter (); gdk_threads_enter ();
#endif
xsmp->idle = 0; xsmp->idle = 0;
@ -593,7 +595,9 @@ idle_do_pending_events (gpointer data)
} }
out: out:
#if !GTK_CHECK_VERSION (3, 0, 0)
gdk_threads_leave (); gdk_threads_leave ();
#endif
return FALSE; return FALSE;
} }
@ -1326,9 +1330,13 @@ process_ice_messages (IceConn ice_conn)
{ {
IceProcessMessagesStatus status; IceProcessMessagesStatus status;
#if GTK_CHECK_VERSION (3, 0, 0)
status = IceProcessMessages (ice_conn, NULL, NULL);
#else
gdk_threads_enter (); gdk_threads_enter ();
status = IceProcessMessages (ice_conn, NULL, NULL); status = IceProcessMessages (ice_conn, NULL, NULL);
gdk_threads_leave (); gdk_threads_leave ();
#endif
switch (status) switch (status)
{ {