exit if it is a non-compliant wm (eg, anything but metacity)

Wed Feb  4 00:05:11 2004  Jonathan Blandford  <jrb@gnome.org>

        * gnome-theme-manager.c (load_meta_themes): exit if it is a
        non-compliant wm (eg, anything but metacity)
This commit is contained in:
Jonathan Blandford 2004-02-04 05:21:28 +00:00 committed by Jonathan Blandford
parent 1355ee215f
commit 4b2fc55b01
2 changed files with 20 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Wed Feb 4 00:05:11 2004 Jonathan Blandford <jrb@gnome.org>
* gnome-theme-manager.c (load_meta_themes): exit if it is a
non-compliant wm (eg, anything but metacity)
Tue Feb 3 23:36:25 2004 Jonathan Blandford <jrb@gnome.org>
* gnome-theme-manager.c (load_meta_themes): use

View file

@ -289,16 +289,24 @@ 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;
if (window_manager)
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 (window_theme_default_name);
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
_("The gnome-theme-manager does not know how to change the themes on the current window manager."));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
exit (0);
}
gnome_window_manager_get_settings (window_manager, &wm_settings);
current_window_theme = g_strdup (wm_settings.theme);
/* FIXME: What do we really do when there is no theme? */
if (current_icon_theme == NULL)
current_icon_theme = g_strdup (icon_theme_default_name);