applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle yet another place where gnome_wm_manager_get_current may be NULL.

Browse source 
2003-01-13  Jody Goldberg <jody@gnome.org>

	* gnome-theme-manager.c (load_meta_themes) : handle yet another place
	  where gnome_wm_manager_get_current may be NULL.
This commit is contained in:
Jody Goldberg 2003-01-14 04:08:50 +00:00 • committed by Jody Goldberg
parent f28c52f3f3
commit b43e4c2022
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,8 @@
2003-01-13 Jody Goldberg <jody@gnome.org>
* 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 <jrb@redhat.com>
* gnome-theme-manager.c (main): gnome_theme_init ()

12
capplets/theme-switcher/gnome-theme-manager.c
View file

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