diff options
| author | monsta <[email protected]> | 2016-11-22 15:49:16 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-22 15:49:16 +0300 |
| commit | ea481767c4e3ec19136a5b61ad46f244a9a5ffa7 (patch) | |
| tree | bbcceb1d2a0be587e7127109f57e41e9e9b43f98 /gsearchtool/libeggsmclient | |
| parent | 8f9a34f003061d7c5e6cfe8a8cb64ec6e98d7c4a (diff) | |
| download | mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.bz2 mate-utils-ea481767c4e3ec19136a5b61ad46f244a9a5ffa7.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require mate-panel >= 1.17
Diffstat (limited to 'gsearchtool/libeggsmclient')
| -rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient-private.h | 4 | ||||
| -rw-r--r-- | gsearchtool/libeggsmclient/eggsmclient-xsmp.c | 19 |
2 files changed, 0 insertions, 23 deletions
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 <gtk/gtk.h> -#if !GTK_CHECK_VERSION (3, 0, 0) -#include <gdkconfig.h> -#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) { |