Remove deprecated gdk_screen_make_display_name

2 files changed, 39 insertions, 0 deletions

diff --git a/common/xfwm-common.c b/common/xfwm-common.c
index a89fc9307..fd698465e 100644
--- a/common/xfwm-common.c
+++ b/common/xfwm-common.c
@@ -123,3 +123,40 @@ xfwm_get_n_monitors (GdkScreen *screen)
   return gdk_screen_get_n_monitors (screen);
 #endif
 }
+
+
+
+static gchar *
+substitute_screen_number (const gchar *display_name,
+                          gint         screen_number)
+{
+  GString *str;
+  gchar   *p;
+
+  str = g_string_new (display_name);
+
+  p = strrchr (str->str, '.');
+  if (p != NULL && p > strchr (str->str, ':'))
+    {
+      /* remove screen number from string */
+      g_string_truncate (str, p - str->str);
+    }
+
+  g_string_append_printf (str, ".%d", screen_number);
+
+  return g_string_free (str, FALSE);
+}
+
+
+
+gchar *
+xfwm_make_display_name (GdkScreen *screen)
+{
+  const gchar *name;
+  gint         number;
+
+  name = gdk_display_get_name (gdk_screen_get_display (screen));
+  number = gdk_x11_screen_get_screen_number (screen);
+
+  return substitute_screen_number (name, number);
+}
diff --git a/common/xfwm-common.h b/common/xfwm-common.h
index 742767fb5..e2e8c97b4 100644
--- a/common/xfwm-common.h
+++ b/common/xfwm-common.h
@@ -38,4 +38,6 @@ void              xfwm_get_primary_monitor_geometry     (GdkScreen    *screen,
 
 gint              xfwm_get_n_monitors                   (GdkScreen    *screen);
 
+gchar            *xfwm_make_display_name                (GdkScreen    *screen);
+
 #endif /* !__COMMON_H__ */