Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/data/other/servers.json
    1 1
     {
    
    2 2
        "servers":[
    
    3 3
           "0nl1ne.at",
    
    4
    -      "404.city",
    
    5 4
           "blabber.im",
    
    6
    -      "brauchen.info",
    
    7
    -      "chatme.im",
    
    8
    -      "comm.unicate.me",
    
    9 5
           "creep.im",
    
    10 6
           "deshalbfrei.org",
    
    11 7
           "draugr.de",
    
    12 8
           "im.apinc.org",
    
    13 9
           "jabber-hosting.de",
    
    14
    -      "jabber.at",
    
    15 10
           "jabber.ccc.de",
    
    16 11
           "jabber.cz",
    
    17 12
           "jabber.hot-chilli.net",
    
    18 13
           "jabber.meta.net.nz",
    
    19 14
           "jabber.no",
    
    20 15
           "jabber.sk",
    
    21
    -      "jabber.rueckgr.at",
    
    22 16
           "jabberes.org",
    
    23 17
           "jabbim.com",
    
    24 18
           "jabbim.cz",
    
    ... ... @@ -28,7 +22,6 @@
    28 22
           "lightwitch.org",
    
    29 23
           "linuxlovers.at",
    
    30 24
           "njs.netlab.cz",
    
    31
    -      "pandion.im",
    
    32 25
           "richim.org",
    
    33 26
           "suchat.org",
    
    34 27
           "tigase.im",
    
    ... ... @@ -37,7 +30,5 @@
    37 30
           "verdammung.org",
    
    38 31
           "xabber.de",
    
    39 32
           "xmpp-hosting.de",
    
    40
    -      "xmpp.jp",
    
    41
    -      "zsim.de"
    
    42 33
        ]
    
    43 34
     }

  • gajim/gtk/dataform.py
    ... ... @@ -146,7 +146,7 @@ class FormGrid(Gtk.Grid):
    146 146
                     continue
    
    147 147
     
    
    148 148
                 if options.get('hide-fallback-fields'):
    
    149
    -                if 'fallback' in field.var:
    
    149
    +                if field.var is not None and 'fallback' in field.var:
    
    150 150
                         continue
    
    151 151
     
    
    152 152
                 if field.media: