#904: move more dbus stuff to sub modules

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

src/setup.py

@@ -1800,6 +1800,8 @@ def cython_add(*args, **kwargs):
 
 
 toggle_packages(dbus_ENABLED, "xpra.dbus")
+toggle_packages(dbus_ENABLED and server_ENABLED, "xpra.server.dbus")
+toggle_packages(x11_ENABLED and dbus_ENABLED and server_ENABLED, "xpra.x11.dbus")
 toggle_packages(x11_ENABLED, "xpra.x11", "xpra.x11.bindings")
 if x11_ENABLED:
     make_constants("xpra", "x11", "bindings", "constants")

src/xpra/platform/xposix/gtkmenu_tray.py

@@ -81,6 +81,6 @@ def set_global_menu(self):
                                                }
                                            },
                }
-        from xpra.x11.gtk_x11 import menu
+        from xpra.x11.dbus import menu
         menu.fallback_menus = menus
         #menu.our_menu = "Xpra", menus

src/xpra/platform/xposix/gui.py

@@ -96,7 +96,7 @@ def _get_X11_root_property(name, req_type):
 
 
 def _set_gtk_x11_window_menu(add, wid, window, menus, application_action_callback=None, window_action_callback=None):
-    from xpra.x11.gtk_x11.menu import setup_dbus_window_menu
+    from xpra.x11.dbus.menu import setup_dbus_window_menu
     from xpra.x11.gtk_x11.prop import prop_set, prop_del
     window_props = setup_dbus_window_menu(add, wid, menus, application_action_callback, window_action_callback)
     #window_props may contains X11 window properties we have to clear or set 

src/xpra/server/dbus/__init__.py

@@ -0,0 +1,4 @@
+# This file is part of Xpra.
+# Copyright (C) 2015 Antoine Martin <[email protected]>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.

src/xpra/server/server_base.py

@@ -503,10 +503,10 @@ def init_dbus_server(self):
         if not self.dbus_control:
             return
         try:
-            from xpra.server.dbus_server import DBUS_Server
+            from xpra.server.dbus.dbus_server import DBUS_Server
             self.dbus_server = DBUS_Server(self, os.environ.get("DISPLAY", "").lstrip(":"))
         except Exception as e:
-            log.error("Error setting up our dbus server:")
+            log.error("Error setting up our dbus server:", exc_info=True)
             log.error(" %s", e)
 
 

src/xpra/x11/dbus/__init__.py

@@ -0,0 +1,4 @@
+# This file is part of Xpra.
+# Copyright (C) 2015 Antoine Martin <[email protected]>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.

src/xpra/x11/x11_dbus_server.py → src/xpra/x11/dbus/x11_dbus_server.py

@@ -4,7 +4,7 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-from xpra.server.dbus_server import DBUS_Server, INTERFACE
+from xpra.server.dbus.dbus_server import DBUS_Server, INTERFACE
 import dbus.service
 
 from xpra.log import Logger

src/xpra/x11/server.py

@@ -1243,7 +1243,7 @@ def init_dbus_server(self):
         if not self.dbus_control:
             return
         try:
-            from xpra.x11.x11_dbus_server import X11_DBUS_Server
+            from xpra.x11.dbus.x11_dbus_server import X11_DBUS_Server
             self.dbus_server = X11_DBUS_Server(self, os.environ.get("DISPLAY", "").lstrip(":"))
         except Exception as e:
             log.error("Error setting up our dbus server:")