summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hestilow <hestilow@ximian.com>2001-09-29 22:15:31 +0000
committerRachel Hestilow <hestgray@src.gnome.org>2001-09-29 22:15:31 +0000
commit5305c8087979c332695a00bc1c22259daaae8bc3 (patch)
tree6609589c6afa9c4b9a1f8cc023775ba78e076658
parent019aa00beb4da563ea472697eecf5aaf9539a18e (diff)
downloadgnome-control-center-5305c8087979c332695a00bc1c22259daaae8bc3.tar.gz
Applied patch from drk@sgi.com to fix bug #60822.
2001-09-29 Richard Hestilow <hestilow@ximian.com> * wm-properties-capplet.c: Applied patch from drk@sgi.com to fix bug #60822.
-rw-r--r--capplets/wm-properties/ChangeLog5
-rw-r--r--capplets/wm-properties/wm-properties-capplet.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/capplets/wm-properties/ChangeLog b/capplets/wm-properties/ChangeLog
index f34d4dc84..d895f08b8 100644
--- a/capplets/wm-properties/ChangeLog
+++ b/capplets/wm-properties/ChangeLog
@@ -1,5 +1,10 @@
2001-09-29 Richard Hestilow <hestilow@ximian.com>
+ * wm-properties-capplet.c: Applied patch from drk@sgi.com
+ to fix bug #60822.
+
+2001-09-29 Richard Hestilow <hestilow@ximian.com>
+
* wm-list.c (wm_list_read_dir): Check if config_tryexec is blank,
and if it is, free it and set it to NULL.
(wm_check_present): If there is no config_tryexec, fall back
diff --git a/capplets/wm-properties/wm-properties-capplet.c b/capplets/wm-properties/wm-properties-capplet.c
index 0c7560d12..a5d47fa97 100644
--- a/capplets/wm-properties/wm-properties-capplet.c
+++ b/capplets/wm-properties/wm-properties-capplet.c
@@ -615,7 +615,7 @@ restart (gboolean force)
1, (char **)twm_argv, NULL,
NULL, NULL, 0, NULL,
NULL, NULL, 0, 0};
- const WindowManager twm_fallback = {(GnomeDesktopEntry*)&twm_dentry, "twm", "twm", 0, 0, 1, 0};
+ WindowManager twm_fallback = {(GnomeDesktopEntry*)&twm_dentry, "twm", "twm", 0, 0, 1, 0};
if(selected_wm) {
last_try_was_twm = FALSE;