From ff244dde0780bf186c7be3f4c52ac48e3d1ad7cc Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Fri, 14 Jul 2023 11:05:07 -0400
Subject: [PATCH] Remove deprecated/removed zenity arguments.

Zenity is used by the default force-quit, display-changes and
session-save dialogs. Cinnamon implements the first two, and the
last we don't support at this time, so this change won't have much
impact.

Fixes #666.  \m/
---
 src/compositor/plugins/default.c     |  1 -
 src/core/meta-close-dialog-default.c |  2 +-
 src/core/util.c                      | 11 -----------
 src/meta/util.h                      |  1 -
 src/x11/session.c                    |  2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c
index 08ecf01ac..de1ac7fd3 100644
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -910,7 +910,6 @@ confirm_display_change (MetaPlugin *plugin)
                           NULL,
                           "_Keep This Configuration",
                           "_Restore Previous Configuration",
-                          "preferences-desktop-display",
                           0,
                           NULL, NULL);
 
diff --git a/src/core/meta-close-dialog-default.c b/src/core/meta-close-dialog-default.c
index 5ea32e205..2209c98e5 100644
--- a/src/core/meta-close-dialog-default.c
+++ b/src/core/meta-close-dialog-default.c
@@ -163,7 +163,7 @@ meta_close_dialog_default_show (MetaCloseDialog *dialog)
                       window_content, NULL,
                       window->display->x11_display->screen_name,
                       _("_Force Quit"), _("_Wait"),
-                      "face-sad-symbolic", window->xwindow,
+                      window->xwindow,
                       NULL, NULL);
 
   g_free (window_content);
diff --git a/src/core/util.c b/src/core/util.c
index 3854b3737..198281348 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -594,13 +594,11 @@ append_argument (GPtrArray  *args,
 
 /**
  * meta_show_dialog: (skip)
- * @type: type of dialog
  * @message: message
  * @timeout: timeout
  * @display: display
  * @ok_text: text for Ok button
  * @cancel_text: text for Cancel button
- * @icon_name: icon name
  * @transient_for: window XID of parent
  * @columns: columns
  * @entries: entries
@@ -613,7 +611,6 @@ meta_show_dialog (const char *type,
                   const char *display,
                   const char *ok_text,
                   const char *cancel_text,
-                  const char *icon_name,
                   const int transient_for,
                   GSList *columns,
                   GSList *entries)
@@ -634,8 +631,6 @@ meta_show_dialog (const char *type,
       append_argument (args, display);
     }
 
-  append_argument (args, "--class");
-  append_argument (args, "mutter-dialog");
   append_argument (args, "--title");
   append_argument (args, "");
   append_argument (args, "--text");
@@ -659,12 +654,6 @@ meta_show_dialog (const char *type,
       append_argument (args, cancel_text);
     }
 
-  if (icon_name)
-    {
-      append_argument (args, "--icon-name");
-      append_argument (args, icon_name);
-    }
-
   tmp = columns;
   while (tmp)
     {
diff --git a/src/meta/util.h b/src/meta/util.h
index 86c53bb7c..c7427c1e1 100644
--- a/src/meta/util.h
+++ b/src/meta/util.h
@@ -157,7 +157,6 @@ GPid meta_show_dialog (const char *type,
                        const char *display,
                        const char *ok_text,
                        const char *cancel_text,
-                       const char *icon_name,
                        const int transient_for,
                        GSList *columns,
                        GSList *entries);
diff --git a/src/x11/session.c b/src/x11/session.c
index b1aec0b5a..0edc71c33 100644
--- a/src/x11/session.c
+++ b/src/x11/session.c
@@ -1823,7 +1823,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
                            "you log in."),
                          "240",
                          meta_get_display()->x11_display->screen_name,
-                         NULL, NULL, NULL,
+                         NULL, NULL,
                          None,
                          columns,
                          lame_details);