diff --git a/src/xpra/client/gtk_base/session_info.py b/src/xpra/client/gtk_base/session_info.py index ffe9907a2f..f09fcd33f9 100644 --- a/src/xpra/client/gtk_base/session_info.py +++ b/src/xpra/client/gtk_base/session_info.py @@ -702,13 +702,13 @@ def set_sound_info(label, details, supported, prop): set_sound_info(self.microphone_label, None, self.client.microphone_enabled, self.client.sound_source) self.connection_type_label.set_text(c.info) - protocol_state = p.save_state() - level = protocol_state.get("compression_level") - if level==0: - compression_str = "None" - else: - compression_str = " + ".join([x for x in ("zlib", "lz4", "bz2", "bencode", "rencode", "yaml") if protocol_state.get(x, False)==True]) - compression_str += ", level %s" % level + protocol_info = p.get_info() + encoder = protocol_info.get("encoder") + compression = protocol_info.get("compression") + level = protocol_info.get("compression_level", 0) + compression_str = encoder + " + "+compression + if level>0: + compression_str += " (level %s)" % level self.compression_label.set_text(compression_str) def enclabel(label, cipher): diff --git a/src/xpra/scripts/main.py b/src/xpra/scripts/main.py index d164b37f7f..cce5ce1d65 100755 --- a/src/xpra/scripts/main.py +++ b/src/xpra/scripts/main.py @@ -532,7 +532,7 @@ def parse_cmdline(cmdline): if "rgb32" not in options.encodings: options.encodings.append("rgb32") - #set network attributes: + #packet compression: from xpra.net import compression compressors = [x.strip() for x in options.compressors.split(",")] c_map = {"lz4" : compression.has_lz4, "bz2" : True, "zlib": True} @@ -545,6 +545,10 @@ def parse_cmdline(cmdline): for x,b in c_map.items(): enabled = b and x in compressors setattr(compression, "use_%s" % x, enabled) + if len([b for x,b in c_map.items() if b and x in compressors])==0: + #force compression level to zero since we have none: + options.compression_level = 0 + #packet encoding from xpra.net import packet_encoding packet_encoders = [x.strip() for x in options.packet_encoders.split(",")] pe_map = {"bencode" : packet_encoding.has_bencode,