Fixes for bug #2416: added proper name format in gtk tree model, and update on canceled edit; undid previous hack

svn: r11584

src/plugins/ExportXml.py

@@ -376,7 +376,7 @@ class GrampsDbXmlWriter(UpdateCallback):
             for number, name,fmt_str,active in self.db.name_formats:
                 self.g.write('%s<format number="%d" name="%s" '
                              'fmt_str="%s" active="%d"/>\n'
-                             % ('    ', number, fmt_str, fmt_str, int(active)) )
+                             % ('    ', number, name, fmt_str, int(active)) )
             self.g.write("  </name-formats>\n")
 
     def fix(self,line):

src/plugins/ImportXml.py

@@ -1061,7 +1061,7 @@ class GrampsParser(UpdateCallback):
         if number in self.taken_name_format_numbers:
             number = self.remap_name_format(number)
 
-        self.name_formats.append((number, fmt_str, fmt_str, active))
+        self.name_formats.append((number, name, fmt_str, active))
 
     def remap_name_format(self, old_number):
         if old_number in self.name_formats_map: # This should not happen