[Xfce4-commits] [apps/xfce4-terminal] 01/01: Resolve gdk_screen_make_display_name deprecation warnings

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit e8ecd8df3ee81883cac3dedc6e0768f38cd176dc
Author: Igor <f2404 at yandex.ru>
Date:   Mon Feb 27 20:55:15 2017 +0300

    Resolve gdk_screen_make_display_name deprecation warnings
---
 terminal/terminal-app.c    | 2 +-
 terminal/terminal-screen.c | 5 ++---
 terminal/terminal-window.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 84a9e63..b5a5ab2 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -433,7 +433,7 @@ terminal_app_new_window (TerminalWindow *window,
   screen = gtk_window_get_screen (GTK_WINDOW (window));
 
   win_attr = terminal_window_attr_new ();
-  win_attr->display = gdk_screen_make_display_name (screen);
+  win_attr->display = g_strdup (gdk_display_get_name (gdk_screen_get_display (screen)));
   tab_attr = win_attr->tabs->data;
   tab_attr->directory = g_strdup (working_directory);
   if (window->font)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index c043239..83149c5 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -773,7 +773,7 @@ static gchar**
 terminal_screen_get_child_environment (TerminalScreen *screen)
 {
   GtkWidget     *toplevel;
-  gchar         *display_name;
+  const gchar   *display_name;
   gchar        **result;
   gchar        **p;
   guint          n;
@@ -816,9 +816,8 @@ terminal_screen_get_child_environment (TerminalScreen *screen)
       result[n++] = g_strdup_printf ("WINDOWID=%ld", (glong) gdk_x11_window_get_xid (gtk_widget_get_window (toplevel)));
 
       /* determine the DISPLAY value for the command */
-      display_name = gdk_screen_make_display_name (gtk_widget_get_screen (toplevel));
+      display_name = gdk_display_get_name (gdk_screen_get_display (gtk_widget_get_screen (toplevel)));
       result[n++] = g_strdup_printf ("DISPLAY=%s", display_name);
-      g_free (display_name);
     }
 #endif
 
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index a2a4102..639c808 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -2545,7 +2545,7 @@ terminal_window_get_restart_command (TerminalWindow *window)
   if (G_LIKELY (gscreen != NULL))
     {
       result = g_slist_prepend (result, g_strdup ("--display"));
-      result = g_slist_prepend (result, gdk_screen_make_display_name (gscreen));
+      result = g_slist_prepend (result, g_strdup (gdk_display_get_name (gdk_screen_get_display (gscreen))));
     }
 
   role = gtk_window_get_role (GTK_WINDOW (window));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.