From ae1be578ba0868ea22b2dc93968f82698a658289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 18 Sep 2012 22:57:26 +0200
Subject: [PATCH] util: Use a sad face in the force-quit dialog

https://bugzilla.gnome.org/show_bug.cgi?id=684306
---
 src/core/delete.c  | 3 ++-
 src/core/session.c | 2 +-
 src/core/util.c    | 7 +++++++
 src/meta/util.h    | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/core/delete.c b/src/core/delete.c
index d90e49e3c..29d46f2fb 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -126,7 +126,8 @@ delete_ping_timeout_func (MetaDisplay *display,
     meta_show_dialog ("--question",
                       window_content, NULL,
                       window->screen->screen_name,
-                      _("_Wait"), _("_Force Quit"), window->xwindow,
+                      _("_Wait"), _("_Force Quit"),
+                      "face-sad-symbolic", window->xwindow,
                       NULL, NULL);
 
   g_free (window_content);
diff --git a/src/core/session.c b/src/core/session.c
index c19b17c7b..41f360f7d 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1811,7 +1811,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
                            "you log in."),
                          "240",
                          meta_get_display()->active_screen->screen_name,
-                         NULL, NULL,
+                         NULL, NULL, NULL,
                          None,
                          columns,
                          lame_details);
diff --git a/src/core/util.c b/src/core/util.c
index 06d9ec89f..efb87aad6 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -585,6 +585,7 @@ 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)
@@ -625,6 +626,12 @@ 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 c9fead43b..04bb7bfe1 100644
--- a/src/meta/util.h
+++ b/src/meta/util.h
@@ -107,6 +107,7 @@ 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);