[svn] GnuPG - r4834 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2008-09-25 06:00:36 +0200 (Thu, 25 Sep 2008)
New Revision: 4834

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keyedit.c
Log:
* keyedit.c (keyedit_menu): Fix bug where a modified keyring loses its
modified status after a "clean" or "minimize" that doesn't need to do
anything.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-09-23 21:52:18 UTC (rev 4833)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-09-25 04:00:36 UTC (rev 4834)
@@ -1,3 +1,9 @@
+2008-09-24  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyedit.c (keyedit_menu): Fix bug where a modified keyring loses
+	its modified status after a "clean" or "minimize" that doesn't
+	need to do anything.
+
 2008-09-23  David Shaw  <dshaw at jabberwocky.com>
 
 	* pkclist.c (select_algo_from_prefs): Redo function to rank prefs

Modified: branches/STABLE-BRANCH-1-4/g10/keyedit.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyedit.c	2008-09-23 21:52:18 UTC (rev 4833)
+++ branches/STABLE-BRANCH-1-4/g10/keyedit.c	2008-09-25 04:00:36 UTC (rev 4834)
@@ -2185,11 +2185,13 @@
 	    break;
 
 	  case cmdCLEAN:
-	    redisplay=modified=menu_clean(keyblock,0);
+	    if(menu_clean(keyblock,0))
+	      redisplay=modified=1;
 	    break;
 
 	  case cmdMINIMIZE:
-	    redisplay=modified=menu_clean(keyblock,1);
+	    if(menu_clean(keyblock,1))
+	      redisplay=modified=1;
 	    break;
 
 	  case cmdQUIT: