use connection endpoint as tray title

git-svn-id: https://xpra.org/svn/Xpra/trunk@5007 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Dec 19, 2013 · 845d221 · 845d221
1 parent 9066c6a
commit 845d221
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/xpra/client/ui_client_base.py b/src/xpra/client/ui_client_base.py
@@ -428,7 +428,7 @@ def make_instance(self, class_options, *args):
 
     def setup_xpra_tray(self, tray_icon_filename):
         tray = None
-        #this is the our own tray
+        #this is our own tray
         def xpra_tray_click(button, pressed, time=0):
             log("xpra_tray_click(%s, %s)", button, pressed)
             if button==1 and pressed:
@@ -445,7 +445,10 @@ def xpra_tray_geometry(*args):
         menu = None
         if self.menu_helper:
             menu = self.menu_helper.build()
-        tray = self.make_tray(menu, "Xpra", tray_icon_filename, xpra_tray_geometry, xpra_tray_click, xpra_tray_mouseover, xpra_tray_exit)
+        title = "Xpra"
+        if self._protocol._conn:
+            title = self._protocol._conn.target
+        tray = self.make_tray(menu, title, tray_icon_filename, xpra_tray_geometry, xpra_tray_click, xpra_tray_mouseover, xpra_tray_exit)
         log("setup_xpra_tray(%s)=%s", tray_icon_filename, tray)
         return tray