Changeset 1124 in xpra

Timestamp:

07/18/12 14:32:02 (10 months ago)

Author:

antoine

Message:

server also reports gtk/pygtk versions in both "info" requests and "hello" packets so we can show it to the user (useful debugging info)

Location:

trunk/src/xpra

Files:

• platform/client_extras_base.py (modified) (1 diff)
• server.py (modified) (3 diffs)

trunk/src/xpra/platform/client_extras_base.py

@@ -306 +306 @@
             row = new_row(row, "GDK version", label(gdk._version))
         else:
-            row = new_row(row, "PyGTK version", label(".".join([str(x) for x in gtk.pygtk_version])))
-            row = new_row(row, "GTK version", label(".".join([str(x) for x in gtk.gtk_version])))
+            def make_version_str(version):
+                return  ".".join([str(x) for x in version])
+            def make_version_info(prop_name):
+                info = "unknown"
+                if hasattr(gtk, prop_name):
+                    info = make_version_str(getattr(gtk, prop_name))
+                server_version = self.client.server_capabilities.get(prop_name)
+                if server_version:
+                    info += " (server: %s)" % make_version_str(server_version)
+                return info
+            row = new_row(row, "PyGTK version", label(make_version_info("pygtk_version")))
+            row = new_row(row, "GTK version", label(make_version_info("gtk_version")))
 
         if self.client.server_platform:

trunk/src/xpra/server.py

@@ -1006 +1006 @@
     def get_info(self, proto):
         info = {}
-        info["version"] = xpra.__version__
-        try:
-            from xpra.build_info import LOCAL_MODIFICATIONS, BUILD_DATE, BUILT_BY, BUILT_ON, BUILD_BIT, BUILD_CPU, REVISION
-            info["local_modifications"] = LOCAL_MODIFICATIONS
-            info["build_date"] = BUILD_DATE
-            info["built_by"] = BUILT_BY
-            info["built_on"] = BUILT_ON
-            info["build_bit"] = BUILD_BIT
-            info["build_cpu"] = BUILD_CPU
-            info["revision"] = REVISION
-        except:
-            pass
+        self.add_version_info(info)
         info["root_window_size"] = gtk.gdk.get_default_root_window().get_size()
         info["max_desktop_size"] = self.get_max_screen_size()
@@ -1214 +1203 @@
         capabilities["raw_packets"] = True
         capabilities["window_configure"] = True
+        self.add_version_info(capabilities)
         #_get_desktop_size_capability may cause an asynchronous root window resize event
         #so we must give the gtk event loop a chance to run before we query
@@ -1221 +1211 @@
             self._send(["hello", capabilities])
         gobject.idle_add(do_send_hello)
+
+    def add_version_info(self, props):
+        props["version"] = xpra.__version__
+        if hasattr(gtk, "pygtk_version"):
+            props["pygtk_version"] = gtk.pygtk_version
+        props["gtk_version"] = gtk.gtk_version
+        try:
+            from xpra.build_info import LOCAL_MODIFICATIONS, BUILD_DATE, BUILT_BY, BUILT_ON, BUILD_BIT, BUILD_CPU, REVISION
+            props["local_modifications"] = LOCAL_MODIFICATIONS
+            props["build_date"] = BUILD_DATE
+            props["built_by"] = BUILT_BY
+            props["built_on"] = BUILT_ON
+            props["build_bit"] = BUILD_BIT
+            props["build_cpu"] = BUILD_CPU
+            props["revision"] = REVISION
+        except:
+            pass
 
     def send_ping(self):