diff options
| author | monsta <[email protected]> | 2016-05-17 14:08:57 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-05-17 14:08:57 +0300 |
| commit | e670e05cb08c66da2838abe2608cfccb8b09fafd (patch) | |
| tree | f823fc1a2ee1d1beaade9c8805b60939f1ba874c /egg | |
| parent | b17f0ae827ae6f0e949dda38a40ae72d822603b5 (diff) | |
| download | mate-session-manager-e670e05cb08c66da2838abe2608cfccb8b09fafd.tar.bz2 mate-session-manager-e670e05cb08c66da2838abe2608cfccb8b09fafd.tar.xz | |
require GTK+ >= 3.14, drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'egg')
| -rw-r--r-- | egg/eggsmclient-private.h | 3 | ||||
| -rw-r--r-- | egg/eggsmclient-xsmp.c | 19 |
2 files changed, 0 insertions, 22 deletions
diff --git a/egg/eggsmclient-private.h b/egg/eggsmclient-private.h index 84da51b..0cfe941 100644 --- a/egg/eggsmclient-private.h +++ b/egg/eggsmclient-private.h @@ -21,9 +21,6 @@ #define __EGG_SM_CLIENT_PRIVATE_H__ #include <gtk/gtk.h> -#if !GTK_CHECK_VERSION (3, 0, 0) -#include <gdkconfig.h> -#endif #include "eggsmclient.h" #ifdef __cplusplus diff --git a/egg/eggsmclient-xsmp.c b/egg/eggsmclient-xsmp.c index ae6629b..75bb807 100644 --- a/egg/eggsmclient-xsmp.c +++ b/egg/eggsmclient-xsmp.c @@ -366,13 +366,7 @@ 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); } @@ -540,10 +534,6 @@ 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; if (xsmp->waiting_to_emit_quit) @@ -567,9 +557,6 @@ idle_do_pending_events (gpointer data) } out: -#if !GTK_CHECK_VERSION (3, 0, 0) - gdk_threads_leave (); -#endif return FALSE; } @@ -1291,13 +1278,7 @@ 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) { |