gimp r25196 - in trunk: . app/actions app/core

[neo svn gnome org]

Author: neo
Date: Mon Mar 24 17:56:27 2008
New Revision: 25196
URL: http://svn.gnome.org/viewvc/gimp?rev=25196&view=rev

Log:
2008-03-24  Sven Neumann  <sven gimp org>

	* app/core/gimp-user-install.c (user_install_migrate_files): 
don't
	migrate "documents".

	* app/actions/documents-commands.c 
(documents_remove_cmd_callback)
	(documents_remove_dangling_foreach): remove from 
GtkRecentManager
	before removing the item from the documents list.



Modified:
   trunk/ChangeLog
   trunk/app/actions/documents-commands.c
   trunk/app/core/gimp-user-install.c

Modified: trunk/app/actions/documents-commands.c
==============================================================================
--- trunk/app/actions/documents-commands.c	(original)
+++ trunk/app/actions/documents-commands.c	Mon Mar 24 17:56:27 2008
@@ -176,11 +176,11 @@
   context   = gimp_container_view_get_context (editor->view);
   imagefile = gimp_context_get_imagefile (context);
 
-  gimp_container_view_remove_active (editor->view);
-
   uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
 
   gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri, NULL);
+
+  gimp_container_view_remove_active (editor->view);
 }
 
 void
@@ -288,10 +288,10 @@
     {
       const gchar *uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
 
-      gimp_container_remove (container, GIMP_OBJECT (imagefile));
-
       gtk_recent_manager_remove_item (gtk_recent_manager_get_default (), uri,
                                       NULL);
+
+      gimp_container_remove (container, GIMP_OBJECT (imagefile));
     }
 }
 

Modified: trunk/app/core/gimp-user-install.c
==============================================================================
--- trunk/app/core/gimp-user-install.c	(original)
+++ trunk/app/core/gimp-user-install.c	Mon Mar 24 17:56:27 2008
@@ -2,7 +2,7 @@
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
  * gimp-user-install.c
- * Copyright (C) 2000-2006 Michael Natterer and Sven Neumann
+ * Copyright (C) 2000-2008 Michael Natterer and Sven Neumann
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -494,16 +494,17 @@
       if (g_file_test (source, G_FILE_TEST_IS_REGULAR))
         {
           /*  skip these files for all old versions  */
-          if (g_str_has_prefix (basename, "gimpswap.") ||
-              g_str_has_prefix (basename, "pluginrc")  ||
-              g_str_has_prefix (basename, "themerc")   ||
-              g_str_has_prefix (basename, "toolrc"))
+          if (strcmp (basename, "documents") == 0      ||
+              g_str_has_prefix (basename, "gimpswap.") ||
+              strcmp (basename, "pluginrc") == 0       ||
+              strcmp (basename, "themerc") == 0        ||
+              strcmp (basename, "toolrc") == 0)
             {
               goto next_file;
             }
 
-          /*  skip menurc for gimp 2.0 since the format has changed  */
-          if (install->old_minor == 0 && g_str_has_prefix (basename, "menurc"))
+          /*  skip menurc for gimp 2.0 as the format has changed  */
+          if (install->old_minor == 0 && strcmp (basename, "menurc") == 0)
             {
               goto next_file;
             }