From 49e91bc9093010e269816da1df763a0374dbc515 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Fri, 24 Oct 2014 16:31:11 +0200
Subject: Update meta_show_dialog for gtk's removal of --screen

gtk3 no longer has the --screen command-line argument, which
metacity was passing to zenity. Use --display (with an
explicitly-specified screen number) instead.
Author: Dan Winship
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687938

Based on metacity commit: 8d19afdcccaec28a5512b0a707d8238b9dd4e2f3
---
 src/core/delete.c  | 4 ++--
 src/core/session.c | 2 +-
 src/core/util.c    | 8 +++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/core')

diff --git a/src/core/delete.c b/src/core/delete.c
index 42360a5a..a93a2ac7 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -105,8 +105,8 @@ delete_ping_timeout_func (MetaDisplay *display,
 
   dialog_pid =
     meta_show_dialog ("--question",
-                      window_content, 0,
-                      window->screen->number,
+                      window_content, NULL,
+                      window->screen->screen_name,
                       _("_Wait"), _("_Force Quit"), window->xwindow,
                       NULL, NULL);
 
diff --git a/src/core/session.c b/src/core/session.c
index 80bf9a0d..495ac950 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1809,7 +1809,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
                            "and will have to be restarted manually next time "
                            "you log in."),
                          "240",
-                         meta_screen_get_screen_number (meta_get_display()->active_screen),
+                         meta_get_display()->active_screen->screen_name,
                          NULL, NULL,
                          None,
                          columns,
diff --git a/src/core/util.c b/src/core/util.c
index b3239976..1cb7793c 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -542,7 +542,7 @@ GPid
 meta_show_dialog (const char *type,
                   const char *message,
                   const char *timeout,
-                  const gint screen_number,
+                  const char *display,
                   const char *ok_text,
                   const char *cancel_text,
                   const int transient_for,
@@ -550,7 +550,6 @@ meta_show_dialog (const char *type,
                   GSList *entries)
 {
   GError *error = NULL;
-  char *screen_number_text = g_strdup_printf("%d", screen_number);
   GSList *tmp;
   int i=0;
   GPid child_pid;
@@ -561,8 +560,8 @@ meta_show_dialog (const char *type,
 
   argvl[i++] = "zenity";
   argvl[i++] = type;
-  argvl[i++] = "--screen";
-  argvl[i++] = screen_number_text;
+  argvl[i++] = "--display";
+  argvl[i++] = display;
   argvl[i++] = "--class";
   argvl[i++] = "marco-dialog";
   argvl[i++] = "--title";
@@ -627,7 +626,6 @@ meta_show_dialog (const char *type,
     unsetenv ("WINDOWID");
 
   g_free (argvl);
-  g_free (screen_number_text);
 
   if (error)
     {
-- 
cgit v1.2.1