Moved the (last-tip-shown xx) entry to sessionrc. You might want to

delete that line from your gimprc, but it works fine without doing so.


--Sven

ChangeLog

@@ -1,3 +1,13 @@
+Wed Jun 24 00:45:01 MEST 1998 Sven Neumann <sven@gimp.org>
+
+	* gimprc
+	* app/gimprc.c
+	* app/preferences_dialog.c
+	* app/session.c
+	* app/tips_dialog.c: Moved the (last-tip-shown xx) entry to 
+	sessionrc. You might want to delete that line from your gimprc, 
+	but it works fine without doing so.
+
 Tue Jun 23 23:21:16 MEST 1998 Sven Neumann <sven@gimp.org>
 
 	* app/commands.c

app/dialogs/preferences-dialog.c

@@ -269,7 +269,10 @@ file_prefs_save_callback (GtkWidget *widget,
   if (marching_speed != old_marching_speed)
     update = g_list_append (update, "marching-ants-speed");
   if (allow_resize_windows != old_allow_resize_windows)
-    update = g_list_append (update, "allow-resize-windows");
+    {
+      update = g_list_append (update, "allow-resize-windows");
+      remove = g_list_append (remove, "dont-allow-resize-windows");
+    }
   if (auto_save != old_auto_save)
     {
       update = g_list_append (update, "auto-save");
@@ -288,9 +291,15 @@ file_prefs_save_callback (GtkWidget *widget,
   if (cubic_interpolation != old_cubic_interpolation)
     update = g_list_append (update, "cubic-interpolation");
   if (confirm_on_close != old_confirm_on_close)
-    update = g_list_append (update, "confirm-on-close");
+    {
+      update = g_list_append (update, "confirm-on-close");
+      remove = g_list_append (remove, "dont-confirm-on-close");
+    }
   if (save_window_positions_on_exit != old_save_window_positions_on_exit)
-    update = g_list_append (update, "save-window-positions-on-exit");
+    {
+      update = g_list_append (update, "save-window-positions-on-exit");
+      remove = g_list_append (remove, "dont-save-window-positions-on-exit");
+    }
   if (default_width != old_default_width ||
       default_height != old_default_height)
     update = g_list_append (update, "default-image-size");

app/dialogs/tips-dialog.c

@@ -149,16 +149,15 @@ tips_dialog_hide (GtkWidget *widget,
 
   gtk_widget_hide (tips_dialog);
 
-  update = g_list_append (update, "last-tip-shown"); /* always save this */
+  /* the last-shown-tip is now saved in sessionrc */
+
   if (show_tips != old_show_tips)
     {
       update = g_list_append (update, "show-tips");
       remove = g_list_append (remove, "dont-show-tips");
       old_show_tips = show_tips;
+      save_gimprc (&update, &remove);
     }
-  last_tip++;
-  save_gimprc (&update, &remove);
-  last_tip--;
   g_list_free (update);
   g_list_free (remove);
 

app/gimprc.c

@@ -201,6 +201,8 @@ static ParseFunc funcs[] =
   { "default-threshold",     TT_INT,        &default_threshold, NULL },
   { "stingy-memory-use",     TT_BOOLEAN,    &stingy_memory_use, NULL },
   { "allow-resize-windows",  TT_BOOLEAN,    &allow_resize_windows, NULL },
+  { "dont-allow-resize-windows",  
+                             TT_BOOLEAN,    NULL, &allow_resize_windows },
   { "cursor-updating",       TT_BOOLEAN,    NULL, &no_cursor_updating },
   { "no-cursor-updating",    TT_BOOLEAN,    &no_cursor_updating, NULL },
   { "preview-size",          TT_XPREVSIZE,  NULL, NULL },

app/gui/preferences-dialog.c

@@ -269,7 +269,10 @@ file_prefs_save_callback (GtkWidget *widget,
   if (marching_speed != old_marching_speed)
     update = g_list_append (update, "marching-ants-speed");
   if (allow_resize_windows != old_allow_resize_windows)
-    update = g_list_append (update, "allow-resize-windows");
+    {
+      update = g_list_append (update, "allow-resize-windows");
+      remove = g_list_append (remove, "dont-allow-resize-windows");
+    }
   if (auto_save != old_auto_save)
     {
       update = g_list_append (update, "auto-save");
@@ -288,9 +291,15 @@ file_prefs_save_callback (GtkWidget *widget,
   if (cubic_interpolation != old_cubic_interpolation)
     update = g_list_append (update, "cubic-interpolation");
   if (confirm_on_close != old_confirm_on_close)
-    update = g_list_append (update, "confirm-on-close");
+    {
+      update = g_list_append (update, "confirm-on-close");
+      remove = g_list_append (remove, "dont-confirm-on-close");
+    }
   if (save_window_positions_on_exit != old_save_window_positions_on_exit)
-    update = g_list_append (update, "save-window-positions-on-exit");
+    {
+      update = g_list_append (update, "save-window-positions-on-exit");
+      remove = g_list_append (remove, "dont-save-window-positions-on-exit");
+    }
   if (default_width != old_default_width ||
       default_height != old_default_height)
     update = g_list_append (update, "default-image-size");

app/gui/session.c

@@ -22,11 +22,16 @@
    I include a short description here on what is done and what problems 
    are left.
 
+   Since everything saved in sessionrc changes often (with each session?) 
+   the whole file is rewritten each time the gimp exits. I don't see any
+   use in implementing a more flexible scheme like it is used for gimprc.
+
    Right now session-managment is limited to window geometry. I plan to add 
    at least the saving of Last-Used-Images (using nuke's patch).
 
    There is a problem with the offset introduced by the window-manager adding
    decorations to the windows. This is annoying and should be fixed somehow.
+   ( Update: I was promised that this will be fixed in gtk. )
    
    Still not sure how to implement stuff for opening windows on start-up.
    Probably the best thing to do, would be to have a list of dialogs in
@@ -108,8 +113,12 @@ save_sessionrc (void)
       fprintf(fp, "# you quit the gimp. If this file isn't found, defaults\n");
       fprintf(fp, "# are used.\n\n");
 
+      /* save window geometries */
       g_list_foreach (session_geometry_updates, (GFunc)sessionrc_write_geometry, fp);
 
+      /* save last tip shown */
+      fprintf(fp, "(last-tip-shown %d)\n\n", last_tip + 1);
+
       fclose (fp);
     }
 }

app/gui/tips-dialog.c

@@ -149,16 +149,15 @@ tips_dialog_hide (GtkWidget *widget,
 
   gtk_widget_hide (tips_dialog);
 
-  update = g_list_append (update, "last-tip-shown"); /* always save this */
+  /* the last-shown-tip is now saved in sessionrc */
+
   if (show_tips != old_show_tips)
     {
       update = g_list_append (update, "show-tips");
       remove = g_list_append (remove, "dont-show-tips");
       old_show_tips = show_tips;
+      save_gimprc (&update, &remove);
     }
-  last_tip++;
-  save_gimprc (&update, &remove);
-  last_tip--;
   g_list_free (update);
   g_list_free (remove);
 

app/preferences_dialog.c

@@ -269,7 +269,10 @@ file_prefs_save_callback (GtkWidget *widget,
   if (marching_speed != old_marching_speed)
     update = g_list_append (update, "marching-ants-speed");
   if (allow_resize_windows != old_allow_resize_windows)
-    update = g_list_append (update, "allow-resize-windows");
+    {
+      update = g_list_append (update, "allow-resize-windows");
+      remove = g_list_append (remove, "dont-allow-resize-windows");
+    }
   if (auto_save != old_auto_save)
     {
       update = g_list_append (update, "auto-save");
@@ -288,9 +291,15 @@ file_prefs_save_callback (GtkWidget *widget,
   if (cubic_interpolation != old_cubic_interpolation)
     update = g_list_append (update, "cubic-interpolation");
   if (confirm_on_close != old_confirm_on_close)
-    update = g_list_append (update, "confirm-on-close");
+    {
+      update = g_list_append (update, "confirm-on-close");
+      remove = g_list_append (remove, "dont-confirm-on-close");
+    }
   if (save_window_positions_on_exit != old_save_window_positions_on_exit)
-    update = g_list_append (update, "save-window-positions-on-exit");
+    {
+      update = g_list_append (update, "save-window-positions-on-exit");
+      remove = g_list_append (remove, "dont-save-window-positions-on-exit");
+    }
   if (default_width != old_default_width ||
       default_height != old_default_height)
     update = g_list_append (update, "default-image-size");

app/session.c

@@ -22,11 +22,16 @@
    I include a short description here on what is done and what problems 
    are left.
 
+   Since everything saved in sessionrc changes often (with each session?) 
+   the whole file is rewritten each time the gimp exits. I don't see any
+   use in implementing a more flexible scheme like it is used for gimprc.
+
    Right now session-managment is limited to window geometry. I plan to add 
    at least the saving of Last-Used-Images (using nuke's patch).
 
    There is a problem with the offset introduced by the window-manager adding
    decorations to the windows. This is annoying and should be fixed somehow.
+   ( Update: I was promised that this will be fixed in gtk. )
    
    Still not sure how to implement stuff for opening windows on start-up.
    Probably the best thing to do, would be to have a list of dialogs in
@@ -108,8 +113,12 @@ save_sessionrc (void)
       fprintf(fp, "# you quit the gimp. If this file isn't found, defaults\n");
       fprintf(fp, "# are used.\n\n");
 
+      /* save window geometries */
       g_list_foreach (session_geometry_updates, (GFunc)sessionrc_write_geometry, fp);
 
+      /* save last tip shown */
+      fprintf(fp, "(last-tip-shown %d)\n\n", last_tip + 1);
+
       fclose (fp);
     }
 }

app/tips_dialog.c

@@ -149,16 +149,15 @@ tips_dialog_hide (GtkWidget *widget,
 
   gtk_widget_hide (tips_dialog);
 
-  update = g_list_append (update, "last-tip-shown"); /* always save this */
+  /* the last-shown-tip is now saved in sessionrc */
+
   if (show_tips != old_show_tips)
     {
       update = g_list_append (update, "show-tips");
       remove = g_list_append (remove, "dont-show-tips");
       old_show_tips = show_tips;
+      save_gimprc (&update, &remove);
     }
-  last_tip++;
-  save_gimprc (&update, &remove);
-  last_tip--;
   g_list_free (update);
   g_list_free (remove);