Profile: Sort VCard on save

gajim/gtk/profile.py

@@ -197,7 +197,6 @@ def _on_cancel_clicked(self, _widget):
         self._ui.nickname_entry.set_sensitive(False)
         self._ui.avatar_image.set_from_surface(self._current_avatar)
         self._ui.nickname_entry.set_text(app.nicks[self.account])
-        self._vcard_grid.clear()
         self._vcard_grid.set_vcard(self._current_vcard.copy())
         self._new_avatar = False
 
@@ -214,6 +213,7 @@ def _on_save_clicked(self, _widget):
         self._ui.nickname_entry.set_sensitive(False)
 
         self._vcard_grid.validate()
+        self._vcard_grid.sort()
 
         vcard = self._vcard_grid.get_vcard()
         self._current_vcard = vcard.copy()

gajim/gtk/vcard_grid.py

@@ -158,6 +158,7 @@ def set_editable(self, enabled):
             prop.set_editable(enabled)
 
     def set_vcard(self, vcard):
+        self.clear()
         self._vcard = vcard
 
         for entry in ORDER:
@@ -205,6 +206,9 @@ def clear(self):
 
         self._props = []
 
+    def sort(self):
+        self.set_vcard(self._vcard)
+
 
 class DescriptionLabel(Gtk.Label):
     def __init__(self, value):