From 62ec5f979e7544eac73f30cc11a7ffbf57117af7 Mon Sep 17 00:00:00 2001
From: mimi89999 <michel@lebihan.pl>
Date: Fri, 19 Feb 2021 19:27:14 +0100
Subject: Change servers.json format

---
 gajim/data/other/servers.json | 54 +++++++++++++++++++++----------------------
 gajim/gtk/account_wizard.py   |  4 ++--
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/gajim/data/other/servers.json b/gajim/data/other/servers.json
index f16371b6e..2472b7772 100644
--- a/gajim/data/other/servers.json
+++ b/gajim/data/other/servers.json
@@ -1,28 +1,26 @@
-{
-   "servers":[
-      "0nl1ne.at",
-      "blabber.im",
-      "creep.im",
-      "deshalbfrei.org",
-      "draugr.de",
-      "jabber.ccc.de",
-      "jabber.cz",
-      "jabber.meta.net.nz",
-      "jabber.no",
-      "jabber.sk",
-      "jabberes.org",
-      "jabbim.com",
-      "jabbim.cz",
-      "jabbim.pl",
-      "jabbim.sk",
-      "jabster.pl",
-      "lightwitch.org",
-      "linuxlovers.at",
-      "njs.netlab.cz",
-      "tigase.im",
-      "ubuntu-jabber.de",
-      "ubuntu-jabber.net",
-      "verdammung.org",
-      "xabber.de"
-   ]
-}
+[
+    "0nl1ne.at",
+    "blabber.im",
+    "creep.im",
+    "deshalbfrei.org",
+    "draugr.de",
+    "jabber.ccc.de",
+    "jabber.cz",
+    "jabber.meta.net.nz",
+    "jabber.no",
+    "jabber.sk",
+    "jabberes.org",
+    "jabbim.com",
+    "jabbim.cz",
+    "jabbim.pl",
+    "jabbim.sk",
+    "jabster.pl",
+    "lightwitch.org",
+    "linuxlovers.at",
+    "njs.netlab.cz",
+    "tigase.im",
+    "ubuntu-jabber.de",
+    "ubuntu-jabber.net",
+    "verdammung.org",
+    "xabber.de"
+]
diff --git a/gajim/gtk/account_wizard.py b/gajim/gtk/account_wizard.py
index 1022b84e2..c057d0aff 100644
--- a/gajim/gtk/account_wizard.py
+++ b/gajim/gtk/account_wizard.py
@@ -559,7 +559,7 @@ class Login(Page):
     def _create_server_completion(self):
         # Parse servers.json
         file_path = configpaths.get('DATA') / 'other' / 'servers.json'
-        self._servers = helpers.load_json(file_path, 'servers', [])
+        self._servers = helpers.load_json(file_path, default=[])
 
         # Create a separate model for the address entry, because it will
         # be updated with our localpart@
@@ -658,7 +658,7 @@ class Signup(Page):
     def _create_server_completion(self):
         # Parse servers.json
         file_path = configpaths.get('DATA') / 'other' / 'servers.json'
-        servers = helpers.load_json(file_path, 'servers', [])
+        servers = helpers.load_json(file_path, default=[])
 
         # Create servers_model for comboboxes and entries
         servers_model = Gtk.ListStore(str)
-- 
cgit v1.2.3