GTK3: don't use deprecated gdk_threads_{enter/leave}
This commit is contained in:
parent
6454339a1a
commit
a08bd0ed2f
|
@ -970,12 +970,16 @@ hide_search_window (PlumaView *view, gboolean cancel)
|
||||||
static gboolean
|
static gboolean
|
||||||
search_entry_flush_timeout (PlumaView *view)
|
search_entry_flush_timeout (PlumaView *view)
|
||||||
{
|
{
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
GDK_THREADS_ENTER ();
|
GDK_THREADS_ENTER ();
|
||||||
|
#endif
|
||||||
|
|
||||||
view->priv->typeselect_flush_timeout = 0;
|
view->priv->typeselect_flush_timeout = 0;
|
||||||
hide_search_window (view, FALSE);
|
hide_search_window (view, FALSE);
|
||||||
|
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
GDK_THREADS_LEAVE ();
|
GDK_THREADS_LEAVE ();
|
||||||
|
#endif
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1189,11 +1193,15 @@ real_search_enable_popdown (gpointer data)
|
||||||
{
|
{
|
||||||
PlumaView *view = (PlumaView *)data;
|
PlumaView *view = (PlumaView *)data;
|
||||||
|
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
GDK_THREADS_ENTER ();
|
GDK_THREADS_ENTER ();
|
||||||
|
#endif
|
||||||
|
|
||||||
view->priv->disable_popdown = FALSE;
|
view->priv->disable_popdown = FALSE;
|
||||||
|
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
GDK_THREADS_LEAVE ();
|
GDK_THREADS_LEAVE ();
|
||||||
|
#endif
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -367,9 +367,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);
|
||||||
|
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
gdk_threads_enter ();
|
gdk_threads_enter ();
|
||||||
|
#endif
|
||||||
gdk_x11_set_sm_client_id (xsmp->client_id);
|
gdk_x11_set_sm_client_id (xsmp->client_id);
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
@ -537,7 +541,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;
|
||||||
|
|
||||||
|
@ -562,7 +568,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1284,9 +1292,13 @@ process_ice_messages (IceConn ice_conn)
|
||||||
{
|
{
|
||||||
IceProcessMessagesStatus status;
|
IceProcessMessagesStatus status;
|
||||||
|
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
gdk_threads_enter ();
|
gdk_threads_enter ();
|
||||||
|
#endif
|
||||||
status = IceProcessMessages (ice_conn, NULL, NULL);
|
status = IceProcessMessages (ice_conn, NULL, NULL);
|
||||||
|
#if !GTK_CHECK_VERSION (3, 0, 0)
|
||||||
gdk_threads_leave ();
|
gdk_threads_leave ();
|
||||||
|
#endif
|
||||||
|
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue