summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-09-27 22:01:02 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-09-27 22:01:02 +0000
commit3009fa8db3f1f1eda97c2c0ab6ed6127dd293903 (patch)
tree9ec058cd3eda844568bfd1f61b11361f5ebe8e32
parent1e43b24c5049fed8b058902a141d7590acb4147c (diff)
downloadgdm-3009fa8db3f1f1eda97c2c0ab6ed6127dd293903.tar.gz
Fix so the wm close works as the Close button in the dialog. Fixes bug
2006-09-27 Brian Cameron <brian.cameron@sun.com> * gui/gdmsetup.c: Fix so the wm close works as the Close button in the dialog. Fixes bug #358002. Patch by Matthias Clasen <mclasen@redhat.com>.
-rw-r--r--ChangeLog6
-rw-r--r--gui/gdmsetup.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e111d92..a3e15b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-09-27 Brian Cameron <brian.cameron@sun.com>
+ * gui/gdmsetup.c: Fix so the wm close works as the Close button
+ in the dialog. Fixes bug #358002. Patch by Matthias Clasen
+ <mclasen@redhat.com>.
+
+2006-09-27 Brian Cameron <brian.cameron@sun.com>
+
* gui/gdmsetup.c: Use g_markup_printf_escaped so gdmsetup better
handles description strings that contains things similar to
a tag like an email address. Fix bug #357998. Patch by
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 29557a9e..ac4ba519 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -4974,7 +4974,8 @@ xserver_button_clicked (void)
g_spawn_command_line_sync ("gnome-open ghelp:gdm", NULL, NULL,
NULL, NULL);
}
- } while (response != GTK_RESPONSE_CLOSE);
+ } while (response != GTK_RESPONSE_CLOSE &&
+ response != GTK_RESPONSE_DELETE_EVENT);
gtk_widget_hide (dialog);
}