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

Don't attempt to load window manager theme name from an unknown window

Browse source 
2006-07-25  Thomas Wood  <thos@gnome.org>

	* gnome-theme-details.c: (window_theme_selection_changed),
	(gnome_theme_details_update_from_gconf): Don't attempt to load window
	manager theme name from an unknown window manager (fixes bug 333276 -
	gnome-theme-manager crashes with xgl/compiz)
This commit is contained in:
Thomas Wood 2006-07-25 09:39:35 +00:00 • committed by Thomas Wood
parent 4a2619c833
commit 189a2f4f7e
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,10 @@
2006-07-25 Thomas Wood <thos@gnome.org>
* gnome-theme-details.c: (window_theme_selection_changed),
(gnome_theme_details_update_from_gconf): Don't attempt to load window
manager theme name from an unknown window manager (fixes bug 333276 -
gnome-theme-manager crashes with xgl/compiz)
2006-07-23 Sebastien Bacher <seb128@debian.org>
* gtk-theme-selector.desktop.in.in: don't list the Application

8
capplets/theme-switcher/gnome-theme-details.c
View file

@ -207,7 +207,7 @@ static void
window_theme_selection_changed (GtkTreeSelection *selection,
gpointer data)
{
GnomeWindowManager *window_manager;
GnomeWindowManager *window_manager = NULL;
GnomeWMSettings wm_settings;
GtkTreeIter iter;
gchar *window_theme_name;
@ -228,7 +228,7 @@ window_theme_selection_changed (GtkTreeSelection *selection,
}
window_manager = gnome_wm_manager_get_current (gdk_display_get_default_screen (gdk_display_get_default ()));
if (window_manager != NULL) {
if (window_manager != NULL && strcmp (gnome_window_manager_get_name (window_manager), "No name")) {
wm_settings.flags = GNOME_WM_SETTING_THEME;
wm_settings.theme = window_theme_name;
gnome_window_manager_change_settings (window_manager, &wm_settings);
@ -723,7 +723,7 @@ gnome_theme_details_update_from_gconf (void)
GladeXML *dialog;
GtkWidget *tree_view;
gchar *theme;
GnomeWindowManager *window_manager;
GnomeWindowManager *window_manager = NULL;
GnomeWMSettings wm_settings;
gnome_theme_details_init ();
@ -741,7 +741,7 @@ gnome_theme_details_update_from_gconf (void)
tree_view = WID ("window_theme_treeview");
wm_settings.flags = GNOME_WM_SETTING_THEME;
if (window_manager) {
if (window_manager != NULL && strcmp (gnome_window_manager_get_name (window_manager), "No name")) {
gnome_window_manager_get_settings (window_manager, &wm_settings);
update_list_something (tree_view, wm_settings.theme);
}