forgot to correctly set the tile_cache_size. Only apply show_tool_tips and

2000-01-26  Michael Natterer  <mitch@gimp.org>

	* app/preferences_dialog.c: forgot to correctly set the
	tile_cache_size. Only apply show_tool_tips and tile_cache_size if
	the prefs settings are not currupt.
This commit is contained in:
Michael Natterer 2000-01-25 23:05:47 +00:00 committed by Michael Natterer
parent 4c68bacfe2
commit 7812dcc213
3 changed files with 84 additions and 51 deletions

View File

@ -390,25 +390,31 @@ file_prefs_ok_callback (GtkWidget *widget,
{
PrefsState state;
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
gimp_help_disable_tooltips ();
if (edit_tile_cache_size != tile_cache_size)
tile_cache_set_size (edit_tile_cache_size);
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
file_prefs_restart_notification ();
/* don't break */
break;
case PREFS_OK:
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
gimp_help_disable_tooltips ();
if (edit_tile_cache_size != old_tile_cache_size)
{
tile_cache_size = edit_tile_cache_size;
tile_cache_set_size (edit_tile_cache_size);
}
break;
default:
break;
}
@ -447,6 +453,20 @@ file_prefs_save_callback (GtkWidget *widget,
gchar *save_palette_path;
gchar *save_gradient_path;
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
g_message (_("You will need to restart GIMP for these "
"changes to take effect."));
/* don't break */
case PREFS_OK:
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
@ -454,22 +474,12 @@ file_prefs_save_callback (GtkWidget *widget,
if (edit_tile_cache_size != old_tile_cache_size)
tile_cache_set_size (edit_tile_cache_size);
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
g_message (_("You will need to restart GIMP for these "
"changes to take effect."));
/* don't break */
case PREFS_OK:
default:
break;
}
gtk_widget_destroy (prefs_dlg);
prefs_dlg = NULL;
@ -748,6 +758,7 @@ file_prefs_save_callback (GtkWidget *widget,
/* values which are changed on "OK" or "Save" */
if (edit_tile_cache_size != old_tile_cache_size)
{
tile_cache_size = edit_tile_cache_size;
update = g_list_append (update, "tile-cache-size");
}

View File

@ -390,25 +390,31 @@ file_prefs_ok_callback (GtkWidget *widget,
{
PrefsState state;
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
gimp_help_disable_tooltips ();
if (edit_tile_cache_size != tile_cache_size)
tile_cache_set_size (edit_tile_cache_size);
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
file_prefs_restart_notification ();
/* don't break */
break;
case PREFS_OK:
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
gimp_help_disable_tooltips ();
if (edit_tile_cache_size != old_tile_cache_size)
{
tile_cache_size = edit_tile_cache_size;
tile_cache_set_size (edit_tile_cache_size);
}
break;
default:
break;
}
@ -447,6 +453,20 @@ file_prefs_save_callback (GtkWidget *widget,
gchar *save_palette_path;
gchar *save_gradient_path;
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
g_message (_("You will need to restart GIMP for these "
"changes to take effect."));
/* don't break */
case PREFS_OK:
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
@ -454,22 +474,12 @@ file_prefs_save_callback (GtkWidget *widget,
if (edit_tile_cache_size != old_tile_cache_size)
tile_cache_set_size (edit_tile_cache_size);
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
g_message (_("You will need to restart GIMP for these "
"changes to take effect."));
/* don't break */
case PREFS_OK:
default:
break;
}
gtk_widget_destroy (prefs_dlg);
prefs_dlg = NULL;
@ -748,6 +758,7 @@ file_prefs_save_callback (GtkWidget *widget,
/* values which are changed on "OK" or "Save" */
if (edit_tile_cache_size != old_tile_cache_size)
{
tile_cache_size = edit_tile_cache_size;
update = g_list_append (update, "tile-cache-size");
}

View File

@ -390,25 +390,31 @@ file_prefs_ok_callback (GtkWidget *widget,
{
PrefsState state;
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
gimp_help_disable_tooltips ();
if (edit_tile_cache_size != tile_cache_size)
tile_cache_set_size (edit_tile_cache_size);
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
file_prefs_restart_notification ();
/* don't break */
break;
case PREFS_OK:
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
gimp_help_disable_tooltips ();
if (edit_tile_cache_size != old_tile_cache_size)
{
tile_cache_size = edit_tile_cache_size;
tile_cache_set_size (edit_tile_cache_size);
}
break;
default:
break;
}
@ -447,6 +453,20 @@ file_prefs_save_callback (GtkWidget *widget,
gchar *save_palette_path;
gchar *save_gradient_path;
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
g_message (_("You will need to restart GIMP for these "
"changes to take effect."));
/* don't break */
case PREFS_OK:
if (show_tool_tips)
gimp_help_enable_tooltips ();
else
@ -454,22 +474,12 @@ file_prefs_save_callback (GtkWidget *widget,
if (edit_tile_cache_size != old_tile_cache_size)
tile_cache_set_size (edit_tile_cache_size);
state = file_prefs_check_settings ();
switch (state)
{
case PREFS_CORRUPT:
return;
break;
case PREFS_RESTART:
gtk_widget_set_sensitive (prefs_dlg, FALSE);
g_message (_("You will need to restart GIMP for these "
"changes to take effect."));
/* don't break */
case PREFS_OK:
default:
break;
}
gtk_widget_destroy (prefs_dlg);
prefs_dlg = NULL;
@ -748,6 +758,7 @@ file_prefs_save_callback (GtkWidget *widget,
/* values which are changed on "OK" or "Save" */
if (edit_tile_cache_size != old_tile_cache_size)
{
tile_cache_size = edit_tile_cache_size;
update = g_list_append (update, "tile-cache-size");
}