summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-07-30 15:18:01 +0000
committerElijah Newren <newren@src.gnome.org>2005-07-30 15:18:01 +0000
commitd5705ef5760acacd499ca80eb974e1d26861882b (patch)
treea03783042b3de8582b63b66e1d7f13612d081ced
parent20b7ee18efdda3b0d51e5038a9cdf72838011c66 (diff)
downloadmetacity-d5705ef5760acacd499ca80eb974e1d26861882b.tar.gz
Patch from Jaap Haitsma to make sure that Metacity dialogs have icons.
2005-07-30 Elijah Newren <newren@gmail.com> Patch from Jaap Haitsma to make sure that Metacity dialogs have icons. Fixes #309876. * src/metacity-dialog.c (kill_window_question, warn_about_no_sm_support, error_about_command): call gtk_window_set_icon_name() to set the dialog icon
-rw-r--r--ChangeLog9
-rw-r--r--src/metacity-dialog.c5
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 52b45132..27bcc826 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-30 Elijah Newren <newren@gmail.com>
+
+ Patch from Jaap Haitsma to make sure that Metacity dialogs have
+ icons. Fixes #309876.
+
+ * src/metacity-dialog.c (kill_window_question,
+ warn_about_no_sm_support, error_about_command): call
+ gtk_window_set_icon_name() to set the dialog icon
+
2005-07-28 Elijah Newren <newren@gmail.com>
* src/place.c (avoid_being_obscured_as_second_modal_dialog):
diff --git a/src/metacity-dialog.c b/src/metacity-dialog.c
index ccd17901..f49d8652 100644
--- a/src/metacity-dialog.c
+++ b/src/metacity-dialog.c
@@ -118,7 +118,8 @@ kill_window_question (const char *window_name,
_("Forcing this application to quit will "
"cause you to lose any unsaved changes."));
g_free (str);
-
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "panel-force-quit");
+
gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label), TRUE);
@@ -261,6 +262,7 @@ warn_about_no_sm_support (char **lame_apps,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
_("These windows do not support \"save current setup\" and will have to be restarted manually next time you log in."));
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "stock_dialog-warning");
g_signal_connect (G_OBJECT (dialog),
"response",
@@ -333,6 +335,7 @@ error_about_command (const char *gconf_key,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
"%s", error);
+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "stock_dialog-error");
gtk_widget_realize (dialog);
copy_of_gdk_x11_window_set_user_time (dialog->window, timestamp);