util: Use a sad face in the force-quit dialog

https://bugzilla.gnome.org/show_bug.cgi?id=684306
This commit is contained in:
Florian Müllner 2012-09-18 22:57:26 +02:00
parent 7e1e9320bc
commit ae1be578ba
4 changed files with 11 additions and 2 deletions

View File

@ -126,7 +126,8 @@ delete_ping_timeout_func (MetaDisplay *display,
meta_show_dialog ("--question", meta_show_dialog ("--question",
window_content, NULL, window_content, NULL,
window->screen->screen_name, window->screen->screen_name,
_("_Wait"), _("_Force Quit"), window->xwindow, _("_Wait"), _("_Force Quit"),
"face-sad-symbolic", window->xwindow,
NULL, NULL); NULL, NULL);
g_free (window_content); g_free (window_content);

View File

@ -1811,7 +1811,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
"you log in."), "you log in."),
"240", "240",
meta_get_display()->active_screen->screen_name, meta_get_display()->active_screen->screen_name,
NULL, NULL, NULL, NULL, NULL,
None, None,
columns, columns,
lame_details); lame_details);

View File

@ -585,6 +585,7 @@ meta_show_dialog (const char *type,
const char *display, const char *display,
const char *ok_text, const char *ok_text,
const char *cancel_text, const char *cancel_text,
const char *icon_name,
const int transient_for, const int transient_for,
GSList *columns, GSList *columns,
GSList *entries) GSList *entries)
@ -625,6 +626,12 @@ meta_show_dialog (const char *type,
append_argument (args, cancel_text); append_argument (args, cancel_text);
} }
if (icon_name)
{
append_argument (args, "--icon-name");
append_argument (args, icon_name);
}
tmp = columns; tmp = columns;
while (tmp) while (tmp)
{ {

View File

@ -107,6 +107,7 @@ GPid meta_show_dialog (const char *type,
const char *display, const char *display,
const char *ok_text, const char *ok_text,
const char *cancel_text, const char *cancel_text,
const char *icon_name,
const int transient_for, const int transient_for,
GSList *columns, GSList *columns,
GSList *entries); GSList *entries);