diff options
| author | raveit65 <[email protected]> | 2016-05-25 20:32:22 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-05-26 01:50:37 +0200 |
| commit | 97b4a71cddd500981a35710505bc28bb4cdcdd75 (patch) | |
| tree | 1cd6519ee648622a46653008bca763c0f561ff3d /copy-n-paste | |
| parent | 6a3dbaa9a6d6ce2b2ff122a14695e3c7b761428f (diff) | |
| download | engrampa-97b4a71cddd500981a35710505bc28bb4cdcdd75.tar.bz2 engrampa-97b4a71cddd500981a35710505bc28bb4cdcdd75.tar.xz | |
GTK3: don't use deprecated gdk_threads_{enter/leave} ()
Diffstat (limited to 'copy-n-paste')
| -rw-r--r-- | copy-n-paste/eggsmclient-xsmp.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/copy-n-paste/eggsmclient-xsmp.c b/copy-n-paste/eggsmclient-xsmp.c index 0601cd9..98b9bbe 100644 --- a/copy-n-paste/eggsmclient-xsmp.c +++ b/copy-n-paste/eggsmclient-xsmp.c @@ -35,6 +35,7 @@ #include <unistd.h> #include <X11/SM/SMlib.h> +#include <gtk/gtk.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> @@ -367,10 +368,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) { |