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

revert the commit on

Browse source 
2004-03-02  Jody Goldberg <jody@gnome.org>

	* gnome-theme-manager.c (load_meta_themes) : revert the commit on
	  Wed Feb  4 00:05:11 2004  Jonathan Blandford  <jrb@gnome.org>
	  exit if it is a non-compliant wm (eg, anything but metacity)

2004-02-25  Fernando Herrera  <fherrera@onirica.com>

	http://bugzilla.gnome.org/show_bug.cgi?id=132902
	* theme-install.glade: use GtkFileChooser.
This commit is contained in:
Jody Goldberg 2004-03-02 15:03:43 +00:00 • committed by Jody Goldberg
parent afc531f70d
commit 26139a231b
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,14 @@
2004-03-02 Jody Goldberg <jody@gnome.org>
* gnome-theme-manager.c (load_meta_themes) : revert the commit on
Wed Feb 4 00:05:11 2004 Jonathan Blandford <jrb@gnome.org>
exit if it is a non-compliant wm (eg, anything but metacity)
2004-02-25 Fernando Herrera <fherrera@onirica.com>
http://bugzilla.gnome.org/show_bug.cgi?id=132902
* theme-install.glade: use GtkFileChooser.
2004-02-13 Jody Goldberg <jody@gnome.org>
* Release 2.5.3

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

@ -290,22 +290,13 @@ load_meta_themes (GtkTreeView *tree_view,
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)
{
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);
}
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);
/* FIXME: What do we really do when there is no theme? */
if (current_icon_theme == NULL)

1
capplets/theme-switcher/theme-install.glade
View file

@ -210,6 +210,7 @@
<property name="max_saved">10</property>
<property name="directory_entry">False</property>
<property name="modal">True</property>
<property name="use_filechooser">True</property>
<child internal-child="entry">
<widget class="GtkEntry" id="install_theme_combo_entry">