Deprecate gdk_set_sm_client_id

And add a gdk_x11_set_sm_client_id to replace it.

gdk/gdk.symbols

@@ -1323,6 +1323,7 @@ gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
 gdk_x11_ungrab_server
+gdk_x11_set_sm_client_id
 #endif
 
 #if IN_FILE(__GDK_EVENTS_X11_C__)

gdk/gdkdisplay.c

@@ -432,6 +432,8 @@ gdk_display_get_core_pointer (GdkDisplay *display)
  * session management and the Inter-Client Communication Conventions Manual
  * (ICCCM) for information on the <literal>WM_CLIENT_LEADER</literal> property. 
  * (Both documents are part of the X Window System distribution.)
+ *
+ * Deprecated:2.24: Use gdk_x11_set_sm_client_id() instead
  **/
 void
 gdk_set_sm_client_id (const gchar* sm_client_id)

gdk/gdkwindow.h

@@ -516,7 +516,9 @@ void gdk_window_set_urgency_hint      (GdkWindow *window,
 void          gdk_window_set_geometry_hints (GdkWindow          *window,
 					     const GdkGeometry  *geometry,
 					     GdkWindowHints      geom_mask);
+#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
 void          gdk_set_sm_client_id          (const gchar        *sm_client_id);
+#endif
 
 void	      gdk_window_begin_paint_rect   (GdkWindow          *window,
 					     const GdkRectangle *rectangle);

gdk/x11/gdkmain-x11.c

@@ -395,6 +395,26 @@ _gdk_windowing_display_set_sm_client_id (GdkDisplay  *display,
 		     gdk_x11_get_xatom_by_name_for_display (display, "SM_CLIENT_ID"));
 }
 
+/**
+ * gdk_x11_set_sm_client_id:
+ * @sm_client_id: the client id assigned by the session manager when the
+ *    connection was opened, or %NULL to remove the property.
+ *
+ * Sets the <literal>SM_CLIENT_ID</literal> property on the application's leader window so that
+ * the window manager can save the application's state using the X11R6 ICCCM
+ * session management protocol.
+ *
+ * See the X Session Management Library documentation for more information on
+ * session management and the Inter-Client Communication Conventions Manual
+ *
+ * Since: 2.24
+ */
+void
+gdk_x11_set_sm_client_id (const gchar *sm_client_id)
+{
+  gdk_set_sm_client_id (sm_client_id);
+}
+
 /* Close all open displays
  */
 void

gdk/x11/gdkx.h

@@ -217,6 +217,8 @@ G_CONST_RETURN char *gdk_x11_font_get_name     (GdkFont *font);
 #endif /* GDK_MULTIHEAD_SAFE */
 #endif /* GDK_DISABLE_DEPRECATED */
 
+void        gdk_x11_set_sm_client_id (const gchar *sm_client_id);
+
 G_END_DECLS
 
 #endif /* __GDK_X_H__ */