From dd5556550e07876cf74db99909be97ef8a87a508 Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 16 May 2014 20:19:25 +0200 Subject: Use gdk_x11_set_sm_client_id also for gtk+2 (since 2.24) --- mate-panel/libegg/eggsmclient-xsmp.c | 6 ------ mate-panel/panel-session.c | 4 ---- 2 files changed, 10 deletions(-) diff --git a/mate-panel/libegg/eggsmclient-xsmp.c b/mate-panel/libegg/eggsmclient-xsmp.c index b5f90cee..3e2a6949 100644 --- a/mate-panel/libegg/eggsmclient-xsmp.c +++ b/mate-panel/libegg/eggsmclient-xsmp.c @@ -37,9 +37,7 @@ #include #include -#if GTK_CHECK_VERSION (3, 0, 0) #include -#endif #define EGG_TYPE_SM_CLIENT_XSMP (egg_sm_client_xsmp_get_type ()) #define EGG_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP)) @@ -371,11 +369,7 @@ sm_client_xsmp_startup (EggSMClient *client, free (ret_client_id); gdk_threads_enter (); -#if GTK_CHECK_VERSION (3, 0, 0) gdk_x11_set_sm_client_id (xsmp->client_id); -#else - gdk_set_sm_client_id (xsmp->client_id); -#endif gdk_threads_leave (); g_debug ("Got client ID \"%s\"", xsmp->client_id); diff --git a/mate-panel/panel-session.c b/mate-panel/panel-session.c index 5f43f3f4..917d9ff5 100644 --- a/mate-panel/panel-session.c +++ b/mate-panel/panel-session.c @@ -80,9 +80,5 @@ panel_session_init (void) /* We don't want the WM to try and save/restore our * window position */ -#if GTK_CHECK_VERSION (3, 0, 0) gdk_x11_set_sm_client_id (NULL); -#else - gdk_set_sm_client_id (NULL); -#endif } -- cgit v1.2.1