summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Nickell <seth@src.gnome.org>2002-10-22 03:54:11 +0000
committerSeth Nickell <seth@src.gnome.org>2002-10-22 03:54:11 +0000
commitaf0063dd7bae01211aa27dc4a0ae212a087c10b8 (patch)
treec1774a7991776ad9e14d9708bf431b6e4cbad7c3
parent2dd038c437a7ecdb9165402196653b6ea4bb5981 (diff)
downloadgnome-control-center-af0063dd7bae01211aa27dc4a0ae212a087c10b8.tar.gz
Fix segfault caused by a WM where the settings module wasn't found.
* gnome-window-properties.c: (update_gui): Fix segfault caused by a WM where the settings module wasn't found.
-rw-r--r--capplets/windows/ChangeLog7
-rw-r--r--capplets/windows/gnome-window-properties.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 8e7808ebb..d98d86a86 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,5 +1,12 @@
2002-10-21 Seth Nickell <snickell@stanford.edu>
+ * gnome-window-properties.c: (update_gui):
+
+ Fix segfault caused by a WM where the settings module
+ wasn't found.
+
+2002-10-21 Seth Nickell <snickell@stanford.edu>
+
Patch from sylvain_pasche@yahoo.fr
* gnome-window-properties.c: (setup_appearance_option_menu):
diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c
index e05f67197..af4844c9a 100644
--- a/capplets/windows/gnome-window-properties.c
+++ b/capplets/windows/gnome-window-properties.c
@@ -151,7 +151,7 @@ update_gui (void)
for (tmp_list = gnome_wm_manager_get_list (); tmp_list != NULL; tmp_list = tmp_list->next) {
wm = tmp_list->data;
- wm_widget_add_wm (wm);
+ if (wm != NULL) wm_widget_add_wm (wm);
}
in_fill = FALSE;