From ea481767c4e3ec19136a5b61ad46f244a9a5ffa7 Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 22 Nov 2016 15:49:16 +0300 Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option and require mate-panel >= 1.17 --- gsearchtool/libeggsmclient/eggsmclient-private.h | 4 ---- gsearchtool/libeggsmclient/eggsmclient-xsmp.c | 19 ------------------- 2 files changed, 23 deletions(-) (limited to 'gsearchtool/libeggsmclient') diff --git a/gsearchtool/libeggsmclient/eggsmclient-private.h b/gsearchtool/libeggsmclient/eggsmclient-private.h index 1313855b..5a2121a8 100644 --- a/gsearchtool/libeggsmclient/eggsmclient-private.h +++ b/gsearchtool/libeggsmclient/eggsmclient-private.h @@ -21,9 +21,6 @@ #define __EGG_SM_CLIENT_PRIVATE_H__ #include -#if !GTK_CHECK_VERSION (3, 0, 0) -#include -#endif #include "eggsmclient.h" G_BEGIN_DECLS @@ -46,5 +43,4 @@ EggSMClient *egg_sm_client_dbus_new (void); G_END_DECLS - #endif /* __EGG_SM_CLIENT_PRIVATE_H__ */ diff --git a/gsearchtool/libeggsmclient/eggsmclient-xsmp.c b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c index 4dbb3ad2..97813788 100644 --- a/gsearchtool/libeggsmclient/eggsmclient-xsmp.c +++ b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c @@ -367,13 +367,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); } @@ -541,10 +535,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) @@ -568,9 +558,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 @@ static gboolean 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) { -- cgit v1.2.1