diff options
| author | infirit <[email protected]> | 2014-05-16 20:19:25 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-16 21:47:47 +0200 |
| commit | dd5556550e07876cf74db99909be97ef8a87a508 (patch) | |
| tree | 3b3dcf1893f76638f631784400ffc7787c5b9569 | |
| parent | 65886d8d05867862632319982af408ed03b6f96c (diff) | |
| download | mate-panel-dd5556550e07876cf74db99909be97ef8a87a508.tar.bz2 mate-panel-dd5556550e07876cf74db99909be97ef8a87a508.tar.xz | |
Use gdk_x11_set_sm_client_id also for gtk+2 (since 2.24)
| -rw-r--r-- | mate-panel/libegg/eggsmclient-xsmp.c | 6 | ||||
| -rw-r--r-- | mate-panel/panel-session.c | 4 |
2 files changed, 0 insertions, 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 <gtk/gtk.h> #include <gdk/gdk.h> -#if GTK_CHECK_VERSION (3, 0, 0) #include <gdk/gdkx.h> -#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 } |