#1247 don't resize desktop server screen to match client's

git-svn-id: https://xpra.org/svn/Xpra/trunk@13577 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/x11/desktop_server.py

@@ -352,8 +352,10 @@ def _process_close_window(self, proto, packet):
 
 
     def set_best_screen_size(self):
-        root_w, root_h = self.root_window.get_size()
-        return root_w, root_h
+        return self.root_window.get_size()
+
+    def _process_desktop_size(self, packet):
+        return
 
     def calculate_desktops(self):
         pass

src/xpra/x11/x11_server_base.py

@@ -1,13 +1,12 @@
 # coding=utf8
 # This file is part of Xpra.
 # Copyright (C) 2011 Serviware (Arthur Huillet, <ahuillet@serviware.com>)
-# Copyright (C) 2010-2014 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2010-2016 Antoine Martin <antoine@devloop.org.uk>
 # Copyright (C) 2008 Nathaniel Smith <njs@pobox.com>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
 import os
-import sys
 import time
 import gtk.gdk