diff options
| author | mimi89999 <michel@lebihan.pl> | 2021-02-19 21:27:14 +0300 |
|---|---|---|
| committer | lovetox <philipp@hoerist.com> | 2021-02-27 14:54:10 +0300 |
| commit | 62ec5f979e7544eac73f30cc11a7ffbf57117af7 (patch) | |
| tree | 1c5659b869bb817f7fe12deea0275021fa53491b | |
| parent | 99ffe9b13a6be1b48ee4dfce63405bad190e7811 (diff) | |
Change servers.json format
| -rw-r--r-- | gajim/data/other/servers.json | 54 | ||||
| -rw-r--r-- | 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) |