From eb2071f8ff99e003af278466d80b59859a421125 Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Wed, 15 Jan 2003 03:21:11 +0000 Subject: [PATCH] yet another place to handle NULL window manager. 2003-01-14 Jody Goldberg * gnome-theme-manager.c (load_meta_themes) : yet another place to handle NULL window manager. --- capplets/theme-switcher/ChangeLog | 5 +++++ capplets/theme-switcher/gnome-theme-manager.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index 3238e0737..8cfea5156 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,8 @@ +2003-01-14 Jody Goldberg + + * gnome-theme-manager.c (load_meta_themes) : yet another place to + handle NULL window manager. + 2003-01-14 Alex Duggan * gnome-theme-manager.c (main): diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c index c47a72a4d..465119ba2 100644 --- a/capplets/theme-switcher/gnome-theme-manager.c +++ b/capplets/theme-switcher/gnome-theme-manager.c @@ -285,8 +285,11 @@ load_meta_themes (GtkTreeView *tree_view, current_icon_theme = gconf_client_get_string (client, ICON_THEME_KEY, NULL); window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ())); wm_settings.flags = GNOME_WM_SETTING_THEME; - gnome_window_manager_get_settings (window_manager, &wm_settings); - current_window_theme = g_strdup (wm_settings.theme); + if (window_manager) { + gnome_window_manager_get_settings (window_manager, &wm_settings); + current_window_theme = g_strdup (wm_settings.theme); + } else + current_window_theme = g_strdup (""); /* FIXME: What do we really do when there is no theme? */ if (current_icon_theme == NULL)