[metacity] Update meta_show_dialog for gtk's removal of --screen gtk3 no longer has the --screen command-line a

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 8d19afdcccaec28a5512b0a707d8238b9dd4e2f3
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Jun 4 10:00:21 2014 +0300

    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

 src/core/delete.c  |    4 ++--
 src/core/session.c |    2 +-
 src/core/util.c    |    8 +++-----
 src/include/util.h |    4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/src/core/delete.c b/src/core/delete.c
index f3ed106..f699716 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -103,8 +103,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 f60afc3..ab6b54e 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1807,7 +1807,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 e7d607f..1fbaed6 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -540,7 +540,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,
@@ -548,7 +548,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;
@@ -559,8 +558,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++] = "metacity-dialog";
   argvl[i++] = "--title";
@@ -625,7 +624,6 @@ meta_show_dialog (const char *type,
     unsetenv ("WINDOWID");
 
   g_free (argvl);
-  g_free (screen_number_text);
 
   if (error)
     {
diff --git a/src/include/util.h b/src/include/util.h
index 54b1193..4828a54 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -97,9 +97,9 @@ char* meta_g_utf8_strndup (const gchar *src, gsize n);
 void  meta_free_gslist_and_elements (GSList *list_to_deep_free);
 
 GPid meta_show_dialog (const char *type,
-                       const char *title,
                        const char *message,
-                       gint timeout,
+                       const char *timeout,
+                       const char *display,
                        const char *ok_text,
                        const char *cancel_text,
                        const int transient_for,