From b43e4c2022f6780ec76339a799be70aa3a0cd10d Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Tue, 14 Jan 2003 04:08:50 +0000 Subject: [PATCH] handle yet another place where gnome_wm_manager_get_current may be NULL. 2003-01-13 Jody Goldberg * gnome-theme-manager.c (load_meta_themes) : handle yet another place where gnome_wm_manager_get_current may be NULL. --- capplets/theme-switcher/ChangeLog | 5 +++++ capplets/theme-switcher/gnome-theme-manager.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog index ee4573af3..9ef2f4ce3 100644 --- a/capplets/theme-switcher/ChangeLog +++ b/capplets/theme-switcher/ChangeLog @@ -1,3 +1,8 @@ +2003-01-13 Jody Goldberg + + * gnome-theme-manager.c (load_meta_themes) : handle yet another place + where gnome_wm_manager_get_current may be NULL. + Mon Jan 13 15:20:17 2003 Jonathan Blandford * gnome-theme-manager.c (main): gnome_theme_init () diff --git a/capplets/theme-switcher/gnome-theme-manager.c b/capplets/theme-switcher/gnome-theme-manager.c index 505e55afd..0a3a827f5 100644 --- a/capplets/theme-switcher/gnome-theme-manager.c +++ b/capplets/theme-switcher/gnome-theme-manager.c @@ -281,12 +281,16 @@ load_meta_themes (GtkTreeView *tree_view, client = gconf_client_get_default (); + /* Get the settings */ current_gtk_theme = gconf_client_get_string (client, GTK_THEME_KEY, NULL); 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) { + wm_settings.flags = GNOME_WM_SETTING_THEME; + 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) @@ -813,8 +817,8 @@ update_settings_from_gconf (void) current_gtk_theme = gconf_client_get_string (client, GTK_THEME_KEY, NULL); 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; if (window_manager) { + wm_settings.flags = GNOME_WM_SETTING_THEME; gnome_window_manager_get_settings (window_manager, &wm_settings); current_window_theme = g_strdup (wm_settings.theme); } else