[gimp] app: don't overwrite all tool options' "tool" and "paint-info"

[Michael Natterer <mitch src gnome org>]

commit 94181ce53809e4a502708726e06f466e3b0734cc
Author: Michael Natterer <mitch gimp org>
Date:   Wed Apr 21 20:41:04 2010 +0200

    app: don't overwrite all tool options' "tool" and "paint-info"
    
    with bogus values from contextrc, we want them to always match the
    tool option's type.

 app/tools/gimp-tools.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index f51beae..12e7cf6 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -313,7 +313,9 @@ gimp_tools_restore (Gimp *gimp)
       gimp_context_copy_properties (gimp_get_user_context (gimp),
                                     GIMP_CONTEXT (tool_info->tool_options),
                                     GIMP_CONTEXT_ALL_PROPS_MASK &~
-                                    tool_info->context_props);
+                                    (tool_info->context_props |
+                                     GIMP_CONTEXT_TOOL_MASK   |
+                                     GIMP_CONTEXT_PAINT_INFO_MASK));
 
       gimp_tool_options_deserialize (tool_info->tool_options, NULL);