summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Adams <robadams@ucla.edu>2003-06-09 18:58:53 +0000
committerRob Adams <readams@src.gnome.org>2003-06-09 18:58:53 +0000
commit3f6bad087d6f4aba9af9a982f54a540461071b47 (patch)
tree16f338e9e849f6ce86734d2dae1e4cd78e953b8b
parentc523d2827c420b410437574e076a35f97477d878 (diff)
downloadmetacity-3f6bad087d6f4aba9af9a982f54a540461071b47.tar.gz
install an alarm to timeout the no-sm-dialog after 4 minutes of
2003-06-09 Rob Adams <robadams@ucla.edu> * src/metacity-dialog.c (warn_about_no_sm_support): install an alarm to timeout the no-sm-dialog after 4 minutes of inactivity. Patch from Ximian. See #114789.
-rw-r--r--ChangeLog6
-rw-r--r--src/metacity-dialog.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 02ad1ab1..d2f61917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-09 Rob Adams <robadams@ucla.edu>
+
+ * src/metacity-dialog.c (warn_about_no_sm_support): install an
+ alarm to timeout the no-sm-dialog after 4 minutes of inactivity.
+ Patch from Ximian. See #114789.
+
2003-06-07 Rob Adams <robadams@ucla.edu>
* src/window.c (meta_window_new): call meta_group_compute_group
diff --git a/src/metacity-dialog.c b/src/metacity-dialog.c
index 717158ca..e2814597 100644
--- a/src/metacity-dialog.c
+++ b/src/metacity-dialog.c
@@ -236,6 +236,9 @@ warn_about_no_sm_support (char **lame_apps)
G_CALLBACK (gtk_main_quit),
NULL);
+ /* Wait 4 minutes then force quit, so we don't wait around all night */
+ g_timeout_add (4 * 60 * 1000, (GSourceFunc) gtk_main_quit, NULL);
+
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
list = create_lame_apps_list (lame_apps);