[gnome-code-assistance] Versioned dbus API
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-code-assistance] Versioned dbus API
- Date: Mon, 11 Nov 2013 22:17:13 +0000 (UTC)
commit 6b3e56def8f45a5dc0c396b4f4ae3e4a05f886b8
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Mon Nov 11 23:17:00 2013 +0100
Versioned dbus API
README.md => README | 22 ++++++------
backends/c/Makefile.am | 2 +-
...ice.in => org.gnome.CodeAssist.v1.c.service.in} | 2 +-
backends/go/Makefile.am | 2 +-
backends/go/dbus.go | 8 ++--
...ce.in => org.gnome.CodeAssist.v1.go.service.in} | 2 +-
backends/go/server_dbus.go | 2 +-
backends/go/transport_dbus.go | 6 ++--
backends/js/Makefile.am | 2 +-
backends/js/main.js | 6 ++--
...ce.in => org.gnome.CodeAssist.v1.js.service.in} | 2 +-
.../gnome/codeassistance/transport_dbus.js | 38 ++++++++++----------
.../gnome/codeassistance/transport_dbus.py | 18 +++++-----
backends/python/Makefile.am | 2 +-
...n => org.gnome.CodeAssist.v1.python.service.in} | 2 +-
.../gnome/codeassistance/transport/dbus.rb | 10 +++---
backends/ruby/Makefile.am | 2 +-
....in => org.gnome.CodeAssist.v1.ruby.service.in} | 2 +-
backends/sh/Makefile.am | 2 +-
...ce.in => org.gnome.CodeAssist.v1.sh.service.in} | 2 +-
backends/vala/Makefile.am | 2 +-
backends/vala/dbus.vala | 16 ++++----
....in => org.gnome.CodeAssist.v1.vala.service.in} | 2 +-
backends/xml/Makefile.am | 2 +-
...e.in => org.gnome.CodeAssist.v1.xml.service.in} | 2 +-
configure.ac | 16 ++++----
26 files changed, 87 insertions(+), 87 deletions(-)
---
diff --git a/README.md b/README
similarity index 93%
rename from README.md
rename to README
index 0bb3a05..732370a 100644
--- a/README.md
+++ b/README
@@ -37,7 +37,7 @@ define the code assistance protocol.
### Interfaces
// All services must implement this interface on the root object.
- type org.gnome.CodeAssist.Service interface {
+ type org.gnome.CodeAssist.v1.Service interface {
// Parse and analyse a single document.
//
// path: the file path to be parsed.
@@ -69,12 +69,12 @@ define the code assistance protocol.
// analysing multiple documents at the same time to complete a translation
// unit. This is mostly useful for statically typed languages, where multiple
// documents are parsed to complete type information (think headers in C).
- type org.gnome.CodeAssist.Project interface {
+ type org.gnome.CodeAssist.v1.Project interface {
// Parse a number of documents to complete the translation unit of the
// given path.
//
// path: the file path to be parsed.
- // cursor: the cursor location (see org.gnome.CodeAssist.Service.Parse).
+ // cursor: the cursor location (see org.gnome.CodeAssist.v1.Service.Parse).
// documents: a list of open documents (path string, dataPath string).
// This list serves two purposes. 1) it provides dataPath
// for all being-edited documents and 2) it provides a list
@@ -94,12 +94,12 @@ define the code assistance protocol.
}
// All services must the Document interface on each document
- type org.gnome.CodeAssist.Document interface {
+ type org.gnome.CodeAssist.v1.Document interface {
}
// The Diagnostics interface can be implemented on a document to provide
// diagnostics after parsing.
- type org.gnome.CodeAssist.Diagnostics {
+ type org.gnome.CodeAssist.v1.Diagnostics {
// Obtain diagnostic information for the document. The return value
// is a list of Diagnostic structs. Each diagnostic contains at least
// a Severity level (e.g. Warning or Error), one or more SourceRange
@@ -111,15 +111,15 @@ define the code assistance protocol.
}
### Objects
-A service for a language `X` is available on the dbus name `org.gnome.CodeAssist.X`.
-It further makes available two objects. The first is located at `/org/gnome/CodeAssist/X`
-and implements at least the `org.gnome.CodeAssist.Service` interface. It
-can optionally also implement the `org.gnome.CodeAssist.Project` interface if
+A service for a language `X` is available on the dbus name `org.gnome.CodeAssist.v1.X`.
+It further makes available two objects. The first is located at `/org/gnome/CodeAssist/v1/X`
+and implements at least the `org.gnome.CodeAssist.v1.Service` interface. It
+can optionally also implement the `org.gnome.CodeAssist.v1.Project` interface if
the language supports parsing multiple documents at once.
-The second object that is made available is located at `/org/gnome/CodeAssist/X/document`
+The second object that is made available is located at `/org/gnome/CodeAssist/v1/X/document`
and represents an empty dummy document which can be introspected to find out
-which services are implemented. All documents implement `org.gnome.CodeAssist.Document`,
+which services are implemented. All documents implement `org.gnome.CodeAssist.v1.Document`,
but other services are optional.
### Types
diff --git a/backends/c/Makefile.am b/backends/c/Makefile.am
index 59a8346..3986d9d 100644
--- a/backends/c/Makefile.am
+++ b/backends/c/Makefile.am
@@ -17,6 +17,6 @@ cbackendexec_SCRIPTS = \
cbackendservicedir = $(datadir)/dbus-1/services
cbackendservice_DATA = \
- backends/c/org.gnome.CodeAssist.c.service
+ backends/c/org.gnome.CodeAssist.v1.c.service
GITIGNOREDEPS += backends/c/Makefile.am
diff --git a/backends/c/org.gnome.CodeAssist.c.service.in b/backends/c/org.gnome.CodeAssist.v1.c.service.in
similarity index 64%
rename from backends/c/org.gnome.CodeAssist.c.service.in
rename to backends/c/org.gnome.CodeAssist.v1.c.service.in
index 1cb7e64..ddc8457 100644
--- a/backends/c/org.gnome.CodeAssist.c.service.in
+++ b/backends/c/org.gnome.CodeAssist.v1.c.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.c
+Name=org.gnome.CodeAssist.v1.c
Exec= backendexecdir@/c --transport dbus
diff --git a/backends/go/Makefile.am b/backends/go/Makefile.am
index 0bb032f..71bfe8d 100644
--- a/backends/go/Makefile.am
+++ b/backends/go/Makefile.am
@@ -13,7 +13,7 @@ backends/go/go: $(backends_go_go_SOURCES)
gobackendservicedir = $(datadir)/dbus-1/services
gobackendservice_DATA = \
- backends/go/org.gnome.CodeAssist.go.service
+ backends/go/org.gnome.CodeAssist.v1.go.service
EXTRA_DIST += backends/go/deps
diff --git a/backends/go/dbus.go b/backends/go/dbus.go
index c5d429d..5c62613 100644
--- a/backends/go/dbus.go
+++ b/backends/go/dbus.go
@@ -27,7 +27,7 @@ func (s *ServiceDbus) Introspect() *introspect.Node {
n := &introspect.Node{
Interfaces: []introspect.Interface{
{
- Name: "org.gnome.CodeAssist.Service",
+ Name: "org.gnome.CodeAssist.v1.Service",
Methods: []introspect.Method{
{
Name: "Parse",
@@ -49,7 +49,7 @@ func (s *ServiceDbus) Introspect() *introspect.Node {
},
introspect.Interface{
- Name: "org.gnome.CodeAssist.Project",
+ Name: "org.gnome.CodeAssist.v1.Project",
Methods: []introspect.Method{
{
Name: "ParseAll",
@@ -73,11 +73,11 @@ func (d *DocumentDbus) Introspect() *introspect.Node {
return &introspect.Node{
Interfaces: []introspect.Interface{
introspect.Interface{
- Name: "org.gnome.CodeAssist.Document",
+ Name: "org.gnome.CodeAssist.v1.Document",
},
introspect.Interface{
- Name: "org.gnome.CodeAssist.Diagnostics",
+ Name: "org.gnome.CodeAssist.v1.Diagnostics",
Methods: []introspect.Method{
{
Name: "Diagnostics",
diff --git a/backends/go/org.gnome.CodeAssist.go.service.in
b/backends/go/org.gnome.CodeAssist.v1.go.service.in
similarity index 64%
rename from backends/go/org.gnome.CodeAssist.go.service.in
rename to backends/go/org.gnome.CodeAssist.v1.go.service.in
index bcdd89b..be8d169 100644
--- a/backends/go/org.gnome.CodeAssist.go.service.in
+++ b/backends/go/org.gnome.CodeAssist.v1.go.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.go
+Name=org.gnome.CodeAssist.v1.go
Exec= backendexecdir@/go --transport dbus
diff --git a/backends/go/server_dbus.go b/backends/go/server_dbus.go
index 00624d0..4bee670 100644
--- a/backends/go/server_dbus.go
+++ b/backends/go/server_dbus.go
@@ -76,7 +76,7 @@ func NewServerDbus(transport *TransportDbus) (*ServerDbus, error) {
}
func (s *ServerDbus) dbusPath() dbus.ObjectPath {
- return "/org/gnome/CodeAssist/go"
+ return "/org/gnome/CodeAssist/v1/go"
}
func (s *ServerDbus) documentDbusPath(app *App, doc *DocumentDbus) dbus.ObjectPath {
diff --git a/backends/go/transport_dbus.go b/backends/go/transport_dbus.go
index 938d1f2..aecba21 100644
--- a/backends/go/transport_dbus.go
+++ b/backends/go/transport_dbus.go
@@ -18,7 +18,7 @@ type ObjectDbus interface {
func NewDbusError(name string, format string, args ...interface{}) *dbus.Error {
return &dbus.Error{
- Name: "org.gnome.CodeAssist.Error." + name,
+ Name: "org.gnome.CodeAssist.v1.Error." + name,
Body: []interface{}{
fmt.Sprintf(format, args...),
},
@@ -58,14 +58,14 @@ func NewTransportDbus() (Transport, error) {
return nil, err
}
- reply, err := conn.RequestName("org.gnome.CodeAssist.go", dbus.NameFlagDoNotQueue)
+ reply, err := conn.RequestName("org.gnome.CodeAssist.v1.go", dbus.NameFlagDoNotQueue)
if err != nil {
return nil, err
}
if reply != dbus.RequestNameReplyPrimaryOwner {
- return nil, errors.New("org.gnome.CodeAssist.go already taken")
+ return nil, errors.New("org.gnome.CodeAssist.v1.go already taken")
}
t := &TransportDbus{
diff --git a/backends/js/Makefile.am b/backends/js/Makefile.am
index eaf503f..c1dab74 100644
--- a/backends/js/Makefile.am
+++ b/backends/js/Makefile.am
@@ -9,6 +9,6 @@ jsbackendexec_SCRIPTS = \
jsbackendservicedir = $(datadir)/dbus-1/services
jsbackendservice_DATA = \
- backends/js/org.gnome.CodeAssist.js.service
+ backends/js/org.gnome.CodeAssist.v1.js.service
GITIGNOREDEPS += backends/js/Makefile.am
diff --git a/backends/js/main.js b/backends/js/main.js
index ef64f41..4941a47 100644
--- a/backends/js/main.js
+++ b/backends/js/main.js
@@ -12,10 +12,10 @@ Document.prototype = {
this.diagnostics = [];
},
- 'org.gnome.CodeAssist.Document': {
+ 'org.gnome.CodeAssist.v1.Document': {
},
- 'org.gnome.CodeAssist.Diagnostics': {
+ 'org.gnome.CodeAssist.v1.Diagnostics': {
diagnostics: function() {
return this.diagnostics;
}
@@ -31,7 +31,7 @@ Service.prototype = {
},
- 'org.gnome.CodeAssist.Service': {
+ 'org.gnome.CodeAssist.v1.Service': {
parse: function(doc, options) {
var c = GLib.file_get_contents(doc.dataPath);
diff --git a/backends/js/org.gnome.CodeAssist.js.service.in
b/backends/js/org.gnome.CodeAssist.v1.js.service.in
similarity index 64%
rename from backends/js/org.gnome.CodeAssist.js.service.in
rename to backends/js/org.gnome.CodeAssist.v1.js.service.in
index 213854f..7da9c58 100644
--- a/backends/js/org.gnome.CodeAssist.js.service.in
+++ b/backends/js/org.gnome.CodeAssist.v1.js.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.js
+Name=org.gnome.CodeAssist.v1.js
Exec= backendexecdir@/js --transport dbus
diff --git a/backends/jscommon/gnome/codeassistance/transport_dbus.js
b/backends/jscommon/gnome/codeassistance/transport_dbus.js
index 44d38bc..d3b9af8 100644
--- a/backends/jscommon/gnome/codeassistance/transport_dbus.js
+++ b/backends/jscommon/gnome/codeassistance/transport_dbus.js
@@ -3,7 +3,7 @@ const Gio = imports.gi.Gio;
const System = imports.system;
const Lang = imports.lang;
-var ServiceIface = '<interface name="org.gnome.CodeAssist.Service"> \
+var ServiceIface = '<interface name="org.gnome.CodeAssist.v1.Service"> \
<method name="Parse"> \
<arg direction="in" type="s" name="path" /> \
<arg direction="in" type="x" name="cursor" /> \
@@ -16,7 +16,7 @@ var ServiceIface = '<interface name="org.gnome.CodeAssist.Service">
</method> \
</interface>';
-var ProjectIface = '<interface name="org.gnome.CodeAssist.Project"> \
+var ProjectIface = '<interface name="org.gnome.CodeAssist.v1.Project"> \
<method name="ParseAll"> \
<arg direction="in" type="s" name="path" /> \
<arg direction="in" type="x" name="cursor" /> \
@@ -26,10 +26,10 @@ var ProjectIface = '<interface name="org.gnome.CodeAssist.Project">
</method> \
</interface>';
-var DocumentIface = '<interface name="org.gnome.CodeAssist.Document"> \
+var DocumentIface = '<interface name="org.gnome.CodeAssist.v1.Document"> \
</interface>';
-var DiagnosticsIface = '<interface name="org.gnome.CodeAssist.Diagnostics"> \
+var DiagnosticsIface = '<interface name="org.gnome.CodeAssist.v1.Diagnostics"> \
<method name="Diagnostics"> \
<arg direction="out" type="a(ua((x(xx)(xx))s)a(x(xx)(xx))s)" name="diagnostics"/> \
</method> \
@@ -106,7 +106,7 @@ Diagnostics.prototype = {
},
Diagnostics: function() {
- let diagnostics = this.doc['org.gnome.CodeAssist.Diagnostics'].diagnostics.call(this.doc);
+ let diagnostics = this.doc['org.gnome.CodeAssist.v1.Diagnostics'].diagnostics.call(this.doc);
return diagnostics.map(function (d) {
return d.toTuple();
@@ -129,9 +129,9 @@ Service.prototype = {
let app = this.ensureApp(sender);
let doc = this.ensureDocument(app, path, dataPath, cursor);
- app.service['org.gnome.CodeAssist.Service'].parse.call(app.service,
- doc,
- options);
+ app.service['org.gnome.CodeAssist.v1.Service'].parse.call(app.service,
+ doc,
+ options);
return this.documentPath(app, doc);
});
@@ -179,7 +179,7 @@ Project.prototype = {
return this.ensureDocument(app, d.path, d.dataPath);
});
- parsed = app.service['org.gnome.CodeAssist.Project'].call(app.service, doc, docs, options);
+ parsed = app.service['org.gnome.CodeAssist.v1.Project'].call(app.service, doc, docs, options);
return parsed.map(function(d) {
return (new RemoteDocument({
@@ -192,13 +192,13 @@ Project.prototype = {
};
var ServerServices = {
- 'org.gnome.CodeAssist.Service': Service,
- 'org.gnome.CodeAssist.Project': Project,
+ 'org.gnome.CodeAssist.v1.Service': Service,
+ 'org.gnome.CodeAssist.v1.Project': Project,
};
var DocumentServices = {
- 'org.gnome.CodeAssist.Document': Document,
- 'org.gnome.CodeAssist.Diagnostics': Diagnostics
+ 'org.gnome.CodeAssist.v1.Document': Document,
+ 'org.gnome.CodeAssist.v1.Diagnostics': Diagnostics
};
const FreedesktopDBusProxy = Gio.DBusProxy.makeProxyWrapper(FreedesktopDBusIface);
@@ -216,7 +216,7 @@ Server.prototype = {
this.apps = {};
this.nextid = 0;
- let path = '/org/gnome/CodeAssist/' + service.language;
+ let path = '/org/gnome/CodeAssist/v1/' + service.language;
// Setup relevant server services
for (let s in ServerServices) {
@@ -289,7 +289,7 @@ Server.prototype = {
},
documentPath: function(app, doc) {
- return '/org/gnome/CodeAssist/' + this.service.language + '/' + app.id + '/documents/' + doc.id;
+ return '/org/gnome/CodeAssist/v1/' + this.service.language + '/' + app.id + '/documents/' + doc.id;
},
makeDocument: function(app, path, clientPath) {
@@ -336,7 +336,7 @@ Server.prototype = {
},
disposeDocument: function(app, doc) {
- app.service['org.gnome.CodeAssist.Service'].dispose.call(app.service, doc);
+ app.service['org.gnome.CodeAssist.v1.Service'].dispose.call(app.service, doc);
for (let i = 0; i < doc._proxies.length; i++) {
doc._proxies[i].dbus.unexport(this.conn);
@@ -387,7 +387,7 @@ Server.prototype = {
let name = e.name;
if (name.indexOf('.') == -1) {
- name = 'org.gnome.CodeAssist.JSError.' + name;
+ name = 'org.gnome.CodeAssist.v1.js.Error.' + name;
}
let errLoc = e.fileName + ':' + e.lineNumber + '.' + e.columnNumber;
@@ -421,7 +421,7 @@ Server.prototype = {
let errLoc = e.fileName + ':' + e.lineNumber + '.' + e.columnNumber;
let errMsg = 'in ' + errLoc + ': ' + objectPath + '(' + ifaceName + '.' + methodName + ') ->
' + outSignature;
- invocation.return_dbus_error('org.gnome.CodeAssist.js.ValueError',
+ invocation.return_dbus_error('org.gnome.CodeAssist.v1.js.ValueError',
'Failed to encode return value in `' + errMsg + '\': ' +
e.message);
return;
}
@@ -453,7 +453,7 @@ Transport.prototype = {
},
run: function() {
- Gio.DBus.session.own_name('org.gnome.CodeAssist.' + this.service.language,
+ Gio.DBus.session.own_name('org.gnome.CodeAssist.v1.' + this.service.language,
Gio.BusNameOwnerFlags.NONE,
Lang.bind(this, this.onBusAcquired),
Lang.bind(this, this.onNameAcquired),
diff --git a/backends/pycommon/gnome/codeassistance/transport_dbus.py
b/backends/pycommon/gnome/codeassistance/transport_dbus.py
index 71a4003..ac32a99 100644
--- a/backends/pycommon/gnome/codeassistance/transport_dbus.py
+++ b/backends/pycommon/gnome/codeassistance/transport_dbus.py
@@ -26,10 +26,10 @@ class Document(dbus.service.Object):
"""Base Document interface.
Implementations should inherit from this base class which implements the
- org.gnome.CodeAssist.Document interface.
+ org.gnome.CodeAssist.v1.Document interface.
"""
- interface = 'org.gnome.CodeAssist.Document'
+ interface = 'org.gnome.CodeAssist.v1.Document'
def __init__(self):
super(Document, self).__init__()
@@ -44,12 +44,12 @@ class Diagnostics(dbus.service.Object):
"""Diagnostics interface.
Implementations can inherit from this class to implement the
- org.gnome.CodeAssist.Diagnostics interface. Diagnostics are served from
+ org.gnome.CodeAssist.v1.Diagnostics interface. Diagnostics are served from
the .diagnostics field which should be set to a list of types.Diagnostic
objects.
"""
- interface = 'org.gnome.CodeAssist.Diagnostics'
+ interface = 'org.gnome.CodeAssist.v1.Diagnostics'
def __init__(self):
super(Diagnostics, self).__init__()
@@ -233,7 +233,7 @@ class Server(dbus.service.Object):
GLib.idle_add(lambda: sys.exit(0))
class ServeService(dbus.service.Object):
- @dbus.service.method('org.gnome.CodeAssist.Service',
+ @dbus.service.method('org.gnome.CodeAssist.v1.Service',
in_signature='sxa(ss)a{sv}', out_signature='o',
sender_keyword='sender')
def Parse(self, path, cursor, data_path, options, sender=None):
@@ -244,7 +244,7 @@ class ServeService(dbus.service.Object):
return doc._object_path
- @dbus.service.method('org.gnome.CodeAssist.Service',
+ @dbus.service.method('org.gnome.CodeAssist.v1.Service',
in_signature='s', out_signature='',
sender_keyword='sender')
def Dispose(self, path, sender=None):
@@ -258,7 +258,7 @@ class ServeService(dbus.service.Object):
self.dispose(app, path)
class ServeProject(dbus.service.Object):
- @dbus.service.method('org.gnome.CodeAssist.Project',
+ @dbus.service.method('org.gnome.CodeAssist.v1.Project',
in_signature='sxa(ss)a{sv}', out_signature='a(so)',
sender_keyword='sender')
def ParseAll(self, path, cursor, documents, options, sender=None):
@@ -276,8 +276,8 @@ class Transport():
def __init__(self, service, document, srvtype=Server):
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
- name = 'org.gnome.CodeAssist.' + service.language
- path = '/org/gnome/CodeAssist/' + service.language
+ name = 'org.gnome.CodeAssist.v1.' + service.language
+ path = '/org/gnome/CodeAssist/v1/' + service.language
bus = dbus.SessionBus()
servercls = self.make_server_cls(service)
diff --git a/backends/python/Makefile.am b/backends/python/Makefile.am
index 432ab73..8719868 100644
--- a/backends/python/Makefile.am
+++ b/backends/python/Makefile.am
@@ -8,6 +8,6 @@ pythonbackendexec_SCRIPTS = \
pythonbackendservicedir = $(datadir)/dbus-1/services
pythonbackendservice_DATA = \
- backends/python/org.gnome.CodeAssist.python.service
+ backends/python/org.gnome.CodeAssist.v1.python.service
GITIGNOREDEPS += backends/python/Makefile.am
diff --git a/backends/python/org.gnome.CodeAssist.python.service.in
b/backends/python/org.gnome.CodeAssist.v1.python.service.in
similarity index 63%
rename from backends/python/org.gnome.CodeAssist.python.service.in
rename to backends/python/org.gnome.CodeAssist.v1.python.service.in
index 3a64b89..739f20a 100644
--- a/backends/python/org.gnome.CodeAssist.python.service.in
+++ b/backends/python/org.gnome.CodeAssist.v1.python.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.python
+Name=org.gnome.CodeAssist.v1.python
Exec= backendexecdir@/python --transport dbus
diff --git a/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
b/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
index fa67fed..c8845cb 100644
--- a/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
+++ b/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
@@ -73,7 +73,7 @@ module Gnome::CodeAssistance::DBus
end
module Diagnostics
- dbus_interface 'org.gnome.CodeAssist.Diagnostics' do
+ dbus_interface 'org.gnome.CodeAssist.v1.Diagnostics' do
dbus_method :Diagnostics, "out diagnostics:a(ua((x(xx)(xx))s)a(x(xx)(xx))s)" do
return [ _doc diagnostics collect { |d| d.to_tuple }]
end
@@ -81,7 +81,7 @@ module Gnome::CodeAssistance::DBus
end
module Service
- dbus_interface 'org.gnome.CodeAssist.Service' do
+ dbus_interface 'org.gnome.CodeAssist.v1.Service' do
dbus_method :Parse, "in path:s, in cursor:x, in data_path:s, in options:a{sv}, out document:o"
do |path, cursor, data_path, options|
app = ensure_app(@sender)
doc = ensure_document(app, path, data_path, cursor)
@@ -100,7 +100,7 @@ module Gnome::CodeAssistance::DBus
end
module Project
- dbus_interface 'org.gnome.CodeAssist.Project' do
+ dbus_interface 'org.gnome.CodeAssist.v1.Project' do
dbus_method :ParseAll, "in path:s, in cursor:x, in docs:a(ss), in options:a{sv}, out
documents:a(so)" do |path, cursor, documents, options|
app = ensure_app(@sender)
doc = ensure_document(app, path, '', cursor)
@@ -310,8 +310,8 @@ module Gnome::CodeAssistance
class Transport
def initialize(service, document)
- name = 'org.gnome.CodeAssist.' + service.language
- path = '/org/gnome/CodeAssist/' + service.language
+ name = 'org.gnome.CodeAssist.v1.' + service.language
+ path = '/org/gnome/CodeAssist/v1/' + service.language
allmods = Gnome::CodeAssistance.constants.collect { |x| Gnome::CodeAssistance.const_get(x) }
diff --git a/backends/ruby/Makefile.am b/backends/ruby/Makefile.am
index cabdf67..1de10bd 100644
--- a/backends/ruby/Makefile.am
+++ b/backends/ruby/Makefile.am
@@ -9,6 +9,6 @@ rubybackendexec_SCRIPTS = \
rubybackendservicedir = $(datadir)/dbus-1/services
rubybackendservice_DATA = \
- backends/ruby/org.gnome.CodeAssist.ruby.service
+ backends/ruby/org.gnome.CodeAssist.v1.ruby.service
GITIGNOREDEPS += backends/ruby/Makefile.am
diff --git a/backends/ruby/org.gnome.CodeAssist.ruby.service.in
b/backends/ruby/org.gnome.CodeAssist.v1.ruby.service.in
similarity index 63%
rename from backends/ruby/org.gnome.CodeAssist.ruby.service.in
rename to backends/ruby/org.gnome.CodeAssist.v1.ruby.service.in
index d1a26c2..0b2b372 100644
--- a/backends/ruby/org.gnome.CodeAssist.ruby.service.in
+++ b/backends/ruby/org.gnome.CodeAssist.v1.ruby.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.ruby
+Name=org.gnome.CodeAssist.v1.ruby
Exec= backendexecdir@/ruby --transport dbus
diff --git a/backends/sh/Makefile.am b/backends/sh/Makefile.am
index a3abc3f..6235f37 100644
--- a/backends/sh/Makefile.am
+++ b/backends/sh/Makefile.am
@@ -8,6 +8,6 @@ shbackendexec_SCRIPTS = \
shbackendservicedir = $(datadir)/dbus-1/services
shbackendservice_DATA = \
- backends/sh/org.gnome.CodeAssist.sh.service
+ backends/sh/org.gnome.CodeAssist.v1.sh.service
GITIGNOREDEPS += backends/sh/Makefile.am
diff --git a/backends/sh/org.gnome.CodeAssist.sh.service.in
b/backends/sh/org.gnome.CodeAssist.v1.sh.service.in
similarity index 64%
rename from backends/sh/org.gnome.CodeAssist.sh.service.in
rename to backends/sh/org.gnome.CodeAssist.v1.sh.service.in
index 335b139..9be936f 100644
--- a/backends/sh/org.gnome.CodeAssist.sh.service.in
+++ b/backends/sh/org.gnome.CodeAssist.v1.sh.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.sh
+Name=org.gnome.CodeAssist.v1.sh
Exec= backendexecdir@/sh --transport dbus
diff --git a/backends/vala/Makefile.am b/backends/vala/Makefile.am
index e7674d5..3d64d2d 100644
--- a/backends/vala/Makefile.am
+++ b/backends/vala/Makefile.am
@@ -24,7 +24,7 @@ endif
valabackendservicedir = $(datadir)/dbus-1/services
valabackendservice_DATA = \
- backends/vala/org.gnome.CodeAssist.vala.service
+ backends/vala/org.gnome.CodeAssist.v1.vala.service
CLEANFILES += \
$(backends_vala_vala_SOURCES:.vala=.c) \
diff --git a/backends/vala/dbus.vala b/backends/vala/dbus.vala
index 6a9c550..c9df068 100644
--- a/backends/vala/dbus.vala
+++ b/backends/vala/dbus.vala
@@ -20,7 +20,7 @@
namespace Gca.Backends.Vala.DBus
{
-[DBus (name = "org.gnome.CodeAssist.Document")]
+[DBus (name = "org.gnome.CodeAssist.v1.Document")]
public class Document : Object
{
private Gca.Backends.Vala.Document? d_document;
@@ -31,7 +31,7 @@ public class Document : Object
}
}
-[DBus (name = "org.gnome.CodeAssist.Diagnostics")]
+[DBus (name = "org.gnome.CodeAssist.v1.Diagnostics")]
public class Diagnostics : Object
{
private Gca.Backends.Vala.Document? d_document;
@@ -59,7 +59,7 @@ interface FreedesktopDBus : Object {
public signal void name_owner_changed(string name, string oldowner, string newowner);
}
-[DBus (name = "org.gnome.CodeAssist.Service")]
+[DBus (name = "org.gnome.CodeAssist.v1.Service")]
public class Service : Object
{
class Document
@@ -177,7 +177,7 @@ public class Service : Object
var doc = new Document(ndoc, app.nextid);
- doc.path = new ObjectPath("/org/gnome/CodeAssist/vala/%u/documents/%u".printf(app.id,
doc.id));
+ doc.path = new ObjectPath("/org/gnome/CodeAssist/v1/vala/%u/documents/%u".printf(app.id,
doc.id));
try
{
@@ -301,9 +301,9 @@ public class Transport
try
{
- conn.register_object("/org/gnome/CodeAssist/vala", d_service);
- conn.register_object("/org/gnome/CodeAssist/vala/document", new DBus.Document());
- conn.register_object("/org/gnome/CodeAssist/vala/document", new DBus.Diagnostics());
+ conn.register_object("/org/gnome/CodeAssist/v1/vala", d_service);
+ conn.register_object("/org/gnome/CodeAssist/v1/vala/document", new DBus.Document());
+ conn.register_object("/org/gnome/CodeAssist/v1/vala/document", new
DBus.Diagnostics());
}
catch (Error e)
{
@@ -323,7 +323,7 @@ public class Transport
public void run()
{
Bus.own_name(BusType.SESSION,
- "org.gnome.CodeAssist.vala",
+ "org.gnome.CodeAssist.v1.vala",
BusNameOwnerFlags.NONE,
on_bus_aquired,
on_name_acquired,
diff --git a/backends/vala/org.gnome.CodeAssist.vala.service.in
b/backends/vala/org.gnome.CodeAssist.v1.vala.service.in
similarity index 63%
rename from backends/vala/org.gnome.CodeAssist.vala.service.in
rename to backends/vala/org.gnome.CodeAssist.v1.vala.service.in
index 8fc3210..eef2723 100644
--- a/backends/vala/org.gnome.CodeAssist.vala.service.in
+++ b/backends/vala/org.gnome.CodeAssist.v1.vala.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.vala
+Name=org.gnome.CodeAssist.v1.vala
Exec= backendexecdir@/vala --transport dbus
diff --git a/backends/xml/Makefile.am b/backends/xml/Makefile.am
index 6fdc7d3..22de766 100644
--- a/backends/xml/Makefile.am
+++ b/backends/xml/Makefile.am
@@ -8,6 +8,6 @@ xmlbackendexec_SCRIPTS = \
xmlbackendservicedir = $(datadir)/dbus-1/services
xmlbackendservice_DATA = \
- backends/xml/org.gnome.CodeAssist.xml.service
+ backends/xml/org.gnome.CodeAssist.v1.xml.service
GITIGNOREDEPS += backends/xml/Makefile.am
diff --git a/backends/xml/org.gnome.CodeAssist.xml.service.in
b/backends/xml/org.gnome.CodeAssist.v1.xml.service.in
similarity index 64%
rename from backends/xml/org.gnome.CodeAssist.xml.service.in
rename to backends/xml/org.gnome.CodeAssist.v1.xml.service.in
index 12f32d2..413905d 100644
--- a/backends/xml/org.gnome.CodeAssist.xml.service.in
+++ b/backends/xml/org.gnome.CodeAssist.v1.xml.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.gnome.CodeAssist.xml
+Name=org.gnome.CodeAssist.v1.xml
Exec= backendexecdir@/xml --transport dbus
diff --git a/configure.ac b/configure.ac
index 0f4a643..a4e825b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,20 +478,20 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
AC_CONFIG_FILES([
Makefile
-backends/c/org.gnome.CodeAssist.c.service
+backends/c/org.gnome.CodeAssist.v1.c.service
backends/c/config.py
backends/c/c
-backends/python/org.gnome.CodeAssist.python.service
+backends/python/org.gnome.CodeAssist.v1.python.service
backends/python/python
-backends/ruby/org.gnome.CodeAssist.ruby.service
+backends/ruby/org.gnome.CodeAssist.v1.ruby.service
backends/ruby/ruby
-backends/xml/org.gnome.CodeAssist.xml.service
+backends/xml/org.gnome.CodeAssist.v1.xml.service
backends/xml/xml
-backends/vala/org.gnome.CodeAssist.vala.service
-backends/go/org.gnome.CodeAssist.go.service
-backends/js/org.gnome.CodeAssist.js.service
+backends/vala/org.gnome.CodeAssist.v1.vala.service
+backends/go/org.gnome.CodeAssist.v1.go.service
+backends/js/org.gnome.CodeAssist.v1.js.service
backends/js/js
-backends/sh/org.gnome.CodeAssist.sh.service
+backends/sh/org.gnome.CodeAssist.v1.sh.service
backends/sh/sh
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
