Re: Freeze Exception for syncevolution 1.2.99.2-1
On Fri, Jul 27, 2012 at 23:37:46 +0200, Julien Cristau wrote:
> On Fri, Jul 20, 2012 at 22:13:20 +0200, Tino Keitel wrote:
>
> > Hi,
> >
> > I would like to get a freeze exception for syncevolution 1.2.99.2-1.
> > This fixes one important bug, enables hardening flags and bumps the
> > upstream version to a new release candidate for version 1.3. The
> > upstream changes are documented in [1].
> >
> > Attached is the debdiff between the version in wheezy and the intended
> > 1.2.99.2-1 code. The package is also available via gitweb[2].
> >
> Sadly this is rather a lot to go through... The logging changes in
> particular are rather noisy. Do we actually need that? What does it
> fix?
Hi Julien,
thanks a lot for the response.
The logging changes are mainly convenience fixes but also bug fixes. I
think you mean this commit:
http://anonscm.debian.org/gitweb/?p=collab-maint/syncevolution.git;a=commitdiff;h=e5c2a860968f2698a70c85dd40221ad4d638cc28
>
> [...]
> > diff -Nru syncevolution-1.2.99.1/src/dbus/interfaces/syncevo-session-full.xml syncevolution-1.2.99.2/src/dbus/interfaces/syncevo-session-full.xml
> > --- syncevolution-1.2.99.1/src/dbus/interfaces/syncevo-session-full.xml 2012-06-22 16:56:20.000000000 +0200
> > +++ syncevolution-1.2.99.2/src/dbus/interfaces/syncevo-session-full.xml 2012-07-02 17:58:20.000000000 +0200
> [...]
> > @@ -115,9 +115,8 @@
> > <arg type="s" name="name" direction="in">
> > <doc:doc><doc:summary>configuration name</doc:summary></doc:doc>
> > </arg>
> > - <arg type="b" name="template" direction="in"/>
> > <arg type="a{sa{ss}}" name="configuration" direction="out"/>
> > - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
> > + <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
> > </method>
> >
> > <method name="SetNamedConfig">
>
> what's the impact of the removal of the template arg above?
>
> > @@ -130,7 +129,7 @@
> > <doc:doc><doc:summary>temporary changes of the configuration are currently only supported for the configuration chosen when creating the session</doc:summary></doc:doc>
> > </arg>
> > <arg type="a{sa{ss}}" name="configuration" direction="in"/>
> > - <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
> > + <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QStringMultiMap"/>
> > </method>
> >
> what does the change from In2 to In3 do?
>
> > <method name="GetReports">
I got patches from upstream which address your comments, they are
attached. He also suggests moving to 1.2.99.3, which is already
prepared and should be the last RC before the 1.3 release. Here is the
reply:
------------------------------------------------------------------------
I'm attaching a patch series that applies to 1.2.99.3 and fixes the
D-Bus interface definition as outlined below. It's currently in
for-master/dbus-xml. I'm also attaching a combined patch.
I suggest to submit 1.2.99.3 with that combined patch for inclusion in
Debian.
------------------------------------------------------------------------
I'll prepare a 1.2.99.3-1 packages with the patches included and send a
new request for a freeze exception.
Thanks again and regards,
Tino
>From 4daf9aa00571b8a9bf1b0820214f31951d8d303f Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Sun, 29 Jul 2012 11:08:14 +0200
Subject: [PATCH 1/4] Revert "Use org.qtproject.QtDBus.QtTypeName.In3 instead
of org.qtproject.QtDBus.QtTypeName.In2"
This reverts commit 2d3153bc486e4ff989b42cdcb0b8c19ab0b70d79.
Reverting to the Qt 4 compatible annotations and fixing
the accidental removal of the "template" parameter in
this method.
---
src/dbus/interfaces/syncevo-session-full.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/dbus/interfaces/syncevo-session-full.xml b/src/dbus/interfaces/syncevo-session-full.xml
index c609211..963c137 100644
--- a/src/dbus/interfaces/syncevo-session-full.xml
+++ b/src/dbus/interfaces/syncevo-session-full.xml
@@ -129,7 +129,7 @@
<doc:doc><doc:summary>temporary changes of the configuration are currently only supported for the configuration chosen when creating the session</doc:summary></doc:doc>
</arg>
<arg type="a{sa{ss}}" name="configuration" direction="in"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QStringMultiMap"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
</method>
<method name="GetReports">
--
1.7.10.4
>From adde54c51074c05ffbf93924e97c4920d083715b Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Sun, 29 Jul 2012 11:09:12 +0200
Subject: [PATCH 2/4] Revert "Use the newer org.qtproject.QtDBus annotation
for DBus interfaces"
This reverts commit 740cd49cbd07d74eac586856357f703be54ea38c.
Going back to Qt4 compatible annotations,
as requested by with Rohan offline.
---
src/dbus/interfaces/syncevo-connection-full.xml | 2 +-
src/dbus/interfaces/syncevo-server-full.xml | 14 ++++++-------
src/dbus/interfaces/syncevo-session-full.xml | 25 ++++++++++++-----------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/dbus/interfaces/syncevo-connection-full.xml b/src/dbus/interfaces/syncevo-connection-full.xml
index 1125dc2..bb76893 100644
--- a/src/dbus/interfaces/syncevo-connection-full.xml
+++ b/src/dbus/interfaces/syncevo-connection-full.xml
@@ -102,7 +102,7 @@
"URL" - the URL for an HTTP POST.
</doc:summary>
</doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMap"/>
</arg>
<arg type="b" name="final">
diff --git a/src/dbus/interfaces/syncevo-server-full.xml b/src/dbus/interfaces/syncevo-server-full.xml
index 98dc713..6b6d59e 100644
--- a/src/dbus/interfaces/syncevo-server-full.xml
+++ b/src/dbus/interfaces/syncevo-server-full.xml
@@ -129,7 +129,7 @@
"system" - some plain text information about system libraries,
"backends" - available backend libraries
</doc:summary></doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMap"/>
</arg>
</method>
@@ -342,7 +342,7 @@
server (or template) configuration
</doc:summary></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
<method name="CheckPresence">
@@ -411,7 +411,7 @@
its pair-value won't be included in the dictionary.
</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
</method>
<method name="GetDatabases">
@@ -444,7 +444,7 @@
</doc:description>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
</method>
<method name="CheckSource">
@@ -585,7 +585,7 @@
version of the transport entity.
</doc:summary>
</doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QStringMap"/>
</arg>
<arg type="b" name="must_authenticate" direction="in">
<doc:doc>
@@ -824,7 +824,7 @@
</doc:summary>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In5" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In5" value="QStringMap"/>
</signal>
<method name="InfoResponse">
@@ -853,7 +853,7 @@
</doc:summary>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMap"/>
</method>
<signal name="LogOutput">
diff --git a/src/dbus/interfaces/syncevo-session-full.xml b/src/dbus/interfaces/syncevo-session-full.xml
index 963c137..7e2d2b0 100644
--- a/src/dbus/interfaces/syncevo-session-full.xml
+++ b/src/dbus/interfaces/syncevo-session-full.xml
@@ -56,7 +56,7 @@
<doc:doc><doc:summary>server configuration</doc:summary></doc:doc>
<doc:doc><doc:description>See Server.GetConfig() for dictionary description.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
<method name="SetConfig">
@@ -104,7 +104,7 @@
<doc:doc><doc:summary>server configuration</doc:summary></doc:doc>
<doc:doc><doc:description>See Server.GetConfig() for dictionary description.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
</method>
<method name="GetNamedConfig">
@@ -115,8 +115,9 @@
<arg type="s" name="name" direction="in">
<doc:doc><doc:summary>configuration name</doc:summary></doc:doc>
</arg>
+ <arg type="b" name="template" direction="in"/>
<arg type="a{sa{ss}}" name="configuration" direction="out"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
<method name="SetNamedConfig">
@@ -129,7 +130,7 @@
<doc:doc><doc:summary>temporary changes of the configuration are currently only supported for the configuration chosen when creating the session</doc:summary></doc:doc>
</arg>
<arg type="a{sa{ss}}" name="configuration" direction="in"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
</method>
<method name="GetReports">
@@ -144,7 +145,7 @@
<doc:doc><doc:summary>synchronization reports</doc:summary></doc:doc>
<doc:doc><doc:description>See Server.GetReports() for array description.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
</method>
@@ -176,7 +177,7 @@
</doc:description>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
</method>
<method name="CheckSource">
@@ -230,7 +231,7 @@
<doc:doc><doc:summary>synchronization source modes</doc:summary></doc:doc>
<doc:doc><doc:description>Source modes to override the 'mode' variable for specific sources. The dictionary key is source name, value is synchronization mode. Valid synchronization modes are all synchronization modes used in syncevolution server configuration files and the empty string.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringMap"/>
</method>
<method name="Abort">
@@ -317,7 +318,7 @@
<doc:doc><doc:summary>Synchronization source status dictionary</doc:summary></doc:doc>
<doc:doc><doc:description>Dictionary key is source name. The value structs contain synchronization mode, source status and error code. Valid values for status are the same as for status parameter above. "done" represents a synced source when the whole sync is not done yet.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QSyncStatusMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out2" value="QSyncStatusMap"/>
</method>
<method name="GetProgress">
@@ -329,7 +330,7 @@
<doc:doc><doc:summary>Synchronization source progress dictionary</doc:summary></doc:doc>
<doc:doc><doc:description>Dictionary key is source name. The value structs contain phase (can be one of "", "preparing", "sending", "receiving"), prepare count, prepare total, send count, send total, receive count and receive total. -1 is used for unknown. Normally only the 'counts' increase but there are cases where the total will increase as well.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QSyncProgressMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="QSyncProgressMap"/>
</method>
<method name="Execute">
@@ -344,7 +345,7 @@
</arg>
<arg type="a{ss}" name="vars" direction="in">
<doc:doc><doc:summary>Environment variables in clients</doc:summary></doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringMap"/>
</arg>
</method>
@@ -353,14 +354,14 @@
<arg type="s" name="status"/>
<arg type="u" name="error"/>
<arg type="a{s(ssu)}" name="sources"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QSyncStatusMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QSyncStatusMap"/>
</signal>
<signal name="ProgressChanged">
<doc:doc><doc:description>Synchronization progress change. See GetProgress() for argument descriptions.</doc:description></doc:doc>
<arg type="i" name="progress"/>
<arg type="a{s(siiiiii)}" name="sources"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSyncProgressMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSyncProgressMap"/>
</signal>
</interface>
--
1.7.10.4
>From 117329eae8f2dbe8c4aed9e4a65cafdb58d272e2 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Sun, 29 Jul 2012 11:27:40 +0200
Subject: [PATCH 3/4] D-Bus interface XML: avoid "template" as parameter name
Using "template" as parameter name causes problems for Qt, because the
name gets used in the generated C++ stubs. The earlier solution for
the problem (spelling it as "tmplate") was accidentally removed in
e4bd5bd while preparing 1.2.99.1.
Let's use "getTemplate" instead of "templateName", because the
parameter itself does not actually contain the name; it's just
a boolean.
---
src/dbus/interfaces/syncevo-server-full.xml | 4 ++--
src/dbus/interfaces/syncevo-session-full.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/dbus/interfaces/syncevo-server-full.xml b/src/dbus/interfaces/syncevo-server-full.xml
index 6b6d59e..6be5707 100644
--- a/src/dbus/interfaces/syncevo-server-full.xml
+++ b/src/dbus/interfaces/syncevo-server-full.xml
@@ -234,7 +234,7 @@
and thus can be used to find all templates refering to the same device.
</doc:para>
</doc:description></doc:doc>
- <arg type="b" name="templateName" direction="in">
+ <arg type="b" name="getTemplate" direction="in">
<doc:doc><doc:summary>
if TRUE, will return template names, otherwise will return
configured servers
@@ -331,7 +331,7 @@
<arg type="s" name="server" direction="in">
<doc:doc><doc:summary>server name</doc:summary></doc:doc>
</arg>
- <arg type="b" name="templateName" direction="in">
+ <arg type="b" name="getTemplate" direction="in">
<doc:doc><doc:summary>
if TRUE, will return a matching template configuration, otherwise
will return a matching server configuration
diff --git a/src/dbus/interfaces/syncevo-session-full.xml b/src/dbus/interfaces/syncevo-session-full.xml
index 7e2d2b0..8c3a6ee 100644
--- a/src/dbus/interfaces/syncevo-session-full.xml
+++ b/src/dbus/interfaces/syncevo-session-full.xml
@@ -49,7 +49,7 @@
<method name="GetConfig">
<doc:doc><doc:description>Get the configuration identified by the name given to StartSession()</doc:description></doc:doc>
- <arg type="b" name="templateName" direction="in">
+ <arg type="b" name="getTemplate" direction="in">
<doc:doc><doc:summary>if TRUE, will return a matching template configuration, otherwise will return the stored configuration</doc:summary></doc:doc>
</arg>
<arg type="a{sa{ss}}" name="configuration" direction="out">
@@ -115,7 +115,7 @@
<arg type="s" name="name" direction="in">
<doc:doc><doc:summary>configuration name</doc:summary></doc:doc>
</arg>
- <arg type="b" name="template" direction="in"/>
+ <arg type="b" name="getTemplate" direction="in"/>
<arg type="a{sa{ss}}" name="configuration" direction="out"/>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
--
1.7.10.4
>From f104db7e2f1ff8e482fbf0d0779704dd0bdee676 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohangarg@kubuntu.org>
Date: Sat, 23 Jun 2012 15:22:31 +0530
Subject: [PATCH 4/4] D-Bus interface XML: fix incorrect numbering of
parameter annotation in Session.SetNamedConfig()
The "configuration" parameter is the forth parameter and thus
has index 3 (numbered from zero). Without this patch, Qt cannot
use the method.
---
src/dbus/interfaces/syncevo-session-full.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/dbus/interfaces/syncevo-session-full.xml b/src/dbus/interfaces/syncevo-session-full.xml
index 8c3a6ee..b191c21 100644
--- a/src/dbus/interfaces/syncevo-session-full.xml
+++ b/src/dbus/interfaces/syncevo-session-full.xml
@@ -130,7 +130,7 @@
<doc:doc><doc:summary>temporary changes of the configuration are currently only supported for the configuration chosen when creating the session</doc:summary></doc:doc>
</arg>
<arg type="a{sa{ss}}" name="configuration" direction="in"/>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In3" value="QStringMultiMap"/>
</method>
<method name="GetReports">
--
1.7.10.4
commit f104db7e2f1ff8e482fbf0d0779704dd0bdee676
commit 117329eae8f2dbe8c4aed9e4a65cafdb58d272e2
commit adde54c51074c05ffbf93924e97c4920d083715b
commit 4daf9aa00571b8a9bf1b0820214f31951d8d303f
The "configuration" parameter is the forth parameter and thus
has index 3 (numbered from zero). Without this patch, Qt cannot
use the method.
Using "template" as parameter name causes problems for Qt, because the
name gets used in the generated C++ stubs. The earlier solution for
the problem (spelling it as "tmplate") was accidentally removed in
e4bd5bd while preparing 1.2.99.1.
Let's use "getTemplate" instead of "templateName", because the
parameter itself does not actually contain the name; it's just
a boolean.
Reverting to the Qt 4 compatible annotations and fixing
the accidental removal of the "template" parameter in
this method.
diff --git a/src/dbus/interfaces/syncevo-connection-full.xml b/src/dbus/interfaces/syncevo-connection-full.xml
index 1125dc2..bb76893 100644
--- a/src/dbus/interfaces/syncevo-connection-full.xml
+++ b/src/dbus/interfaces/syncevo-connection-full.xml
@@ -102,7 +102,7 @@
"URL" - the URL for an HTTP POST.
</doc:summary>
</doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMap"/>
</arg>
<arg type="b" name="final">
diff --git a/src/dbus/interfaces/syncevo-server-full.xml b/src/dbus/interfaces/syncevo-server-full.xml
index 98dc713..6be5707 100644
--- a/src/dbus/interfaces/syncevo-server-full.xml
+++ b/src/dbus/interfaces/syncevo-server-full.xml
@@ -129,7 +129,7 @@
"system" - some plain text information about system libraries,
"backends" - available backend libraries
</doc:summary></doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMap"/>
</arg>
</method>
@@ -234,7 +234,7 @@
and thus can be used to find all templates refering to the same device.
</doc:para>
</doc:description></doc:doc>
- <arg type="b" name="templateName" direction="in">
+ <arg type="b" name="getTemplate" direction="in">
<doc:doc><doc:summary>
if TRUE, will return template names, otherwise will return
configured servers
@@ -331,7 +331,7 @@
<arg type="s" name="server" direction="in">
<doc:doc><doc:summary>server name</doc:summary></doc:doc>
</arg>
- <arg type="b" name="templateName" direction="in">
+ <arg type="b" name="getTemplate" direction="in">
<doc:doc><doc:summary>
if TRUE, will return a matching template configuration, otherwise
will return a matching server configuration
@@ -342,7 +342,7 @@
server (or template) configuration
</doc:summary></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
<method name="CheckPresence">
@@ -411,7 +411,7 @@
its pair-value won't be included in the dictionary.
</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
</method>
<method name="GetDatabases">
@@ -444,7 +444,7 @@
</doc:description>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
</method>
<method name="CheckSource">
@@ -585,7 +585,7 @@
version of the transport entity.
</doc:summary>
</doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QStringMap"/>
</arg>
<arg type="b" name="must_authenticate" direction="in">
<doc:doc>
@@ -824,7 +824,7 @@
</doc:summary>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In5" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In5" value="QStringMap"/>
</signal>
<method name="InfoResponse">
@@ -853,7 +853,7 @@
</doc:summary>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMap"/>
</method>
<signal name="LogOutput">
diff --git a/src/dbus/interfaces/syncevo-session-full.xml b/src/dbus/interfaces/syncevo-session-full.xml
index c609211..b191c21 100644
--- a/src/dbus/interfaces/syncevo-session-full.xml
+++ b/src/dbus/interfaces/syncevo-session-full.xml
@@ -49,14 +49,14 @@
<method name="GetConfig">
<doc:doc><doc:description>Get the configuration identified by the name given to StartSession()</doc:description></doc:doc>
- <arg type="b" name="templateName" direction="in">
+ <arg type="b" name="getTemplate" direction="in">
<doc:doc><doc:summary>if TRUE, will return a matching template configuration, otherwise will return the stored configuration</doc:summary></doc:doc>
</arg>
<arg type="a{sa{ss}}" name="configuration" direction="out">
<doc:doc><doc:summary>server configuration</doc:summary></doc:doc>
<doc:doc><doc:description>See Server.GetConfig() for dictionary description.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
<method name="SetConfig">
@@ -104,7 +104,7 @@
<doc:doc><doc:summary>server configuration</doc:summary></doc:doc>
<doc:doc><doc:description>See Server.GetConfig() for dictionary description.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
</method>
<method name="GetNamedConfig">
@@ -115,8 +115,9 @@
<arg type="s" name="name" direction="in">
<doc:doc><doc:summary>configuration name</doc:summary></doc:doc>
</arg>
+ <arg type="b" name="getTemplate" direction="in"/>
<arg type="a{sa{ss}}" name="configuration" direction="out"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
</method>
<method name="SetNamedConfig">
@@ -129,7 +130,7 @@
<doc:doc><doc:summary>temporary changes of the configuration are currently only supported for the configuration chosen when creating the session</doc:summary></doc:doc>
</arg>
<arg type="a{sa{ss}}" name="configuration" direction="in"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QStringMultiMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In3" value="QStringMultiMap"/>
</method>
<method name="GetReports">
@@ -144,7 +145,7 @@
<doc:doc><doc:summary>synchronization reports</doc:summary></doc:doc>
<doc:doc><doc:description>See Server.GetReports() for array description.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
</method>
@@ -176,7 +177,7 @@
</doc:description>
</doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
</method>
<method name="CheckSource">
@@ -230,7 +231,7 @@
<doc:doc><doc:summary>synchronization source modes</doc:summary></doc:doc>
<doc:doc><doc:description>Source modes to override the 'mode' variable for specific sources. The dictionary key is source name, value is synchronization mode. Valid synchronization modes are all synchronization modes used in syncevolution server configuration files and the empty string.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringMap"/>
</method>
<method name="Abort">
@@ -317,7 +318,7 @@
<doc:doc><doc:summary>Synchronization source status dictionary</doc:summary></doc:doc>
<doc:doc><doc:description>Dictionary key is source name. The value structs contain synchronization mode, source status and error code. Valid values for status are the same as for status parameter above. "done" represents a synced source when the whole sync is not done yet.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QSyncStatusMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out2" value="QSyncStatusMap"/>
</method>
<method name="GetProgress">
@@ -329,7 +330,7 @@
<doc:doc><doc:summary>Synchronization source progress dictionary</doc:summary></doc:doc>
<doc:doc><doc:description>Dictionary key is source name. The value structs contain phase (can be one of "", "preparing", "sending", "receiving"), prepare count, prepare total, send count, send total, receive count and receive total. -1 is used for unknown. Normally only the 'counts' increase but there are cases where the total will increase as well.</doc:description></doc:doc>
</arg>
- <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QSyncProgressMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="QSyncProgressMap"/>
</method>
<method name="Execute">
@@ -344,7 +345,7 @@
</arg>
<arg type="a{ss}" name="vars" direction="in">
<doc:doc><doc:summary>Environment variables in clients</doc:summary></doc:doc>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QStringMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringMap"/>
</arg>
</method>
@@ -353,14 +354,14 @@
<arg type="s" name="status"/>
<arg type="u" name="error"/>
<arg type="a{s(ssu)}" name="sources"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QSyncStatusMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QSyncStatusMap"/>
</signal>
<signal name="ProgressChanged">
<doc:doc><doc:description>Synchronization progress change. See GetProgress() for argument descriptions.</doc:description></doc:doc>
<arg type="i" name="progress"/>
<arg type="a{s(siiiiii)}" name="sources"/>
- <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSyncProgressMap"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSyncProgressMap"/>
</signal>
</interface>
Reply to: