diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-18 21:30:05 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-01 22:46:55 +0100 |
| commit | a08bd0ed2f0959255dc86f7976ec42d512e813b9 (patch) | |
| tree | 4a5d4b25f0067448e6747cd8e3ac5b957f616caa | |
| parent | 6454339a1a2141ff8d33dce2dfff4fd0fc52b227 (diff) | |
| download | pluma-a08bd0ed2f0959255dc86f7976ec42d512e813b9.tar.bz2 pluma-a08bd0ed2f0959255dc86f7976ec42d512e813b9.tar.xz | |
GTK3: don't use deprecated gdk_threads_{enter/leave}
| -rw-r--r-- | pluma/pluma-view.c | 8 | ||||
| -rw-r--r-- | pluma/smclient/eggsmclient-xsmp.c | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c index 6c76efac..293d5da5 100644 --- a/pluma/pluma-view.c +++ b/pluma/pluma-view.c @@ -970,12 +970,16 @@ hide_search_window (PlumaView *view, gboolean cancel) static gboolean search_entry_flush_timeout (PlumaView *view) { +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_ENTER (); +#endif view->priv->typeselect_flush_timeout = 0; hide_search_window (view, FALSE); +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_LEAVE (); +#endif return FALSE; } @@ -1189,11 +1193,15 @@ real_search_enable_popdown (gpointer data) { PlumaView *view = (PlumaView *)data; +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_ENTER (); +#endif view->priv->disable_popdown = FALSE; +#if !GTK_CHECK_VERSION (3, 0, 0) GDK_THREADS_LEAVE (); +#endif return FALSE; } diff --git a/pluma/smclient/eggsmclient-xsmp.c b/pluma/smclient/eggsmclient-xsmp.c index df2aa583..a1a69594 100644 --- a/pluma/smclient/eggsmclient-xsmp.c +++ b/pluma/smclient/eggsmclient-xsmp.c @@ -367,9 +367,13 @@ sm_client_xsmp_startup (EggSMClient *client, xsmp->client_id = g_strdup (ret_client_id); free (ret_client_id); +#if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_enter (); +#endif gdk_x11_set_sm_client_id (xsmp->client_id); +#if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_leave (); +#endif g_debug ("Got client ID \"%s\"", xsmp->client_id); } @@ -537,7 +541,9 @@ idle_do_pending_events (gpointer data) EggSMClientXSMP *xsmp = data; EggSMClient *client = data; +#if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_enter (); +#endif xsmp->idle = 0; @@ -562,7 +568,9 @@ idle_do_pending_events (gpointer data) } out: +#if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_leave (); +#endif return FALSE; } @@ -1284,9 +1292,13 @@ process_ice_messages (IceConn ice_conn) { IceProcessMessagesStatus status; +#if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_enter (); +#endif status = IceProcessMessages (ice_conn, NULL, NULL); +#if !GTK_CHECK_VERSION (3, 0, 0) gdk_threads_leave (); +#endif switch (status) { |