yet another place to handle NULL window manager.

2003-01-14  Jody Goldberg <jody@gnome.org>

	* gnome-theme-manager.c (load_meta_themes) : yet another place to
	handle NULL window manager.
This commit is contained in:
Jody Goldberg 2003-01-15 03:21:11 +00:00 committed by Jody Goldberg
parent 9841338eff
commit eb2071f8ff
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2003-01-14 Jody Goldberg <jody@gnome.org>
* gnome-theme-manager.c (load_meta_themes) : yet another place to
handle NULL window manager.
2003-01-14 Alex Duggan <aldug@gnome.org>
* gnome-theme-manager.c (main):

View file

@ -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)