core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation:
generation of D-Bus bridge has been broken by black formatting tool, this patch fixes this.
This commit is contained in:
parent
b9a6cdd785
commit
f2b1398a9f
4 changed files with 303 additions and 918 deletions
|
|
@ -29,7 +29,7 @@ class DbusXmlConstructor(base_constructor.Constructor):
|
|||
base_constructor.Constructor.__init__(self, bridge_template, options)
|
||||
|
||||
self.template = "dbus_xml_template.xml"
|
||||
self.core_dest = "org.goffi.sat.xml"
|
||||
self.core_dest = "org.salutatoi.sat.xml"
|
||||
self.default_annotation = {
|
||||
"a{ss}": "StringDict",
|
||||
"a(sa{ss}as)": "QList<Contact>",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<node>
|
||||
<interface name="org.goffi.SAT.core">
|
||||
<interface name="org.salutatoi.SAT.core">
|
||||
</interface>
|
||||
</node>
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ log = getLogger(__name__)
|
|||
from twisted.internet.defer import Deferred
|
||||
from sat.core.exceptions import BridgeInitError
|
||||
|
||||
const_INT_PREFIX = "org.goffi.SAT" # Interface prefix
|
||||
const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix
|
||||
const_ERROR_PREFIX = const_INT_PREFIX + ".error"
|
||||
const_OBJ_PATH = "/org/goffi/SAT/bridge"
|
||||
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
|
||||
const_CORE_SUFFIX = ".core"
|
||||
const_PLUGIN_SUFFIX = ".plugin"
|
||||
|
||||
|
|
@ -128,10 +128,10 @@ class DbusObject(dbus.service.Object):
|
|||
# further investigations
|
||||
pass
|
||||
|
||||
##SIGNALS_PART##
|
||||
##SIGNALS_PART##
|
||||
### methods ###
|
||||
|
||||
##METHODS_PART##
|
||||
##METHODS_PART##
|
||||
def __attributes(self, in_sign):
|
||||
"""Return arguments to user given a in_sign
|
||||
@param in_sign: in_sign in the short form (using s,a,i,b etc)
|
||||
|
|
@ -272,7 +272,7 @@ class Bridge(object):
|
|||
self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus)
|
||||
self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
|
||||
|
||||
##SIGNAL_DIRECT_CALLS_PART##
|
||||
##SIGNAL_DIRECT_CALLS_PART##
|
||||
def register_method(self, name, callback):
|
||||
log.debug("registering DBus bridge method [%s]" % name)
|
||||
self.dbus_bridge.register_method(name, callback)
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ DBusGMainLoop(set_as_default=True)
|
|||
|
||||
import ast
|
||||
|
||||
const_INT_PREFIX = "org.goffi.SAT" # Interface prefix
|
||||
const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix
|
||||
const_ERROR_PREFIX = const_INT_PREFIX + ".error"
|
||||
const_OBJ_PATH = '/org/goffi/SAT/bridge'
|
||||
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
|
||||
const_CORE_SUFFIX = ".core"
|
||||
const_PLUGIN_SUFFIX = ".plugin"
|
||||
const_TIMEOUT = 120
|
||||
|
|
|
|||
Loading…
Reference in a new issue