maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trivial: Fixed up various comments and formatting mistakes

This commit is contained in:
Chris Kühl 2012-03-08 14:44:46 +01:00 committed by Patrick Ohly
parent 2eeea6af5c
commit e4bd5bdda9
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -342,7 +342,7 @@ installcheck-local: $(all_local_installchecks) ;
dist-hook: $(all_dist_hooks)
# Force sequential installation. This is a workaround for relinking failures
# during concurrent distcheck (a backed was relinked against not yet installed
# during concurrent distcheck (a backend was relinked against not yet installed
# libsyncevolution.la).
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am

6
src/dbus/interfaces/syncevo-server-full.xml
View File

@ -191,7 +191,7 @@
</doc:doc>
<arg type="s" name="notifications" direction="in">
<doc:doc><doc:summary>
describes the notifications which are to be ensabled; currently
describes the notifications which are to be enabled; currently
ignored by server, pass empty string
</doc:summary></doc:doc>
</arg>
@ -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="tmplate" direction="in">
<arg type="b" name="template" 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="tmplate" direction="in">
<arg type="b" name="template" direction="in">
<doc:doc><doc:summary>
if TRUE, will return a matching template configuration, otherwise
will return a matching server configuration

4
src/dbus/interfaces/syncevo-session-full.xml
View File

@ -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="tmplate" direction="in">
<arg type="b" name="template" 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="tmplate" direction="in"/>
<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"/>
</method>

2
src/syncevo/SuspendFlags.h
View File

@ -105,7 +105,7 @@ class SuspendFlags
/**
* Triggered inside the main thread when the state
* changes. Either printSignals() needs to be called
* or directly or a glib watch must be activated which
* directly or a glib watch must be activated which
* does that.
*/
typedef boost::signals2::signal<void (SuspendFlags &)> StateChanged_t;

18
test/test-dbus.py
View File

@ -1227,7 +1227,7 @@ class TestNamedConfig(unittest.TestCase, DBusUtil):
self.runTest(result)
def testSetNamedConfigError(self):
"""TestDBusSession.testSetNamedConfigError - SetNamedConfig() only allowed in 'all-configs' sessions"""
"""TestNamedConfig.testSetNamedConfigError - SetNamedConfig() only allowed in 'all-configs' sessions"""
self.setUpSession("")
try:
self.session.SetNamedConfig("foobar", False, False, {})
@ -1238,7 +1238,7 @@ class TestNamedConfig(unittest.TestCase, DBusUtil):
self.fail("no exception thrown")
def testSetNamedConfigErrorTemporary(self):
"""TestDBusSession.testSetNamedConfigErrorTemporary - SetNamedConfig() only implemented for session config"""
"""TestNamedConfig.testSetNamedConfigErrorTemporary - SetNamedConfig() only implemented for session config"""
self.setUpSession("foo", [ "all-configs" ])
try:
self.session.SetNamedConfig("foobar", False, True, {})
@ -1253,7 +1253,7 @@ class TestNamedConfig(unittest.TestCase, DBusUtil):
self.session.SetNamedConfig("", False, True, {})
def testSetNamedConfig(self):
"""TestDBusSession.testSetNamedConfig - create two different configs in one session"""
"""TestNamedConfig.testSetNamedConfig - create two different configs in one session"""
self.setUpSession("", [ "all-configs" ])
fooConfig = {"": {"username": "foo", "configName": "foo"}}
@ -1441,7 +1441,7 @@ class TestDBusServerPresence(unittest.TestCase, DBusUtil):
self.setUpSession("foobar")
self.session.SetConfig(False, False, {"" : {"syncURL":
"obex-bt://bt-client-mixed http://http-client-mixed"}})
status = self.session.checkPresence()
status = self.session.CheckPresence()
self.failUnlessEqual (status, "")
# go offline; Bluetooth remains on
@ -1457,14 +1457,14 @@ class TestDBusServerPresence(unittest.TestCase, DBusUtil):
match.remove()
# config uses Bluetooth, so syncing still possible
status = self.session.checkPresence()
status = self.session.CheckPresence()
self.failUnlessEqual (status, "")
# now the same without Bluetooth, while offline
self.session.Detach()
self.setUpSession("foo")
self.session.SetConfig(False, False, {"" : {"syncURL": "http://http-only"}})
status = self.session.checkPresence()
status = self.session.CheckPresence()
self.assertEqual (status, "no transport")
# go online
@ -1478,7 +1478,7 @@ class TestDBusServerPresence(unittest.TestCase, DBusUtil):
byte_arrays=True,
utf8_strings=True)
match.remove()
status = self.session.checkPresence()
status = self.session.CheckPresence()
self.failUnlessEqual (status, "")
# temporary config change shall always affect the
@ -1493,10 +1493,10 @@ class TestDBusServerPresence(unittest.TestCase, DBusUtil):
byte_arrays=True,
utf8_strings=True)
match.remove()
status = self.session.checkPresence()
status = self.session.CheckPresence()
self.failUnlessEqual (status, "no transport")
self.session.SetConfig(True, False, {"" : {"syncURL": "obex-bt://bt-client-mixed"}})
status = self.session.checkPresence()
status = self.session.CheckPresence()
self.failUnlessEqual (status, "")
def run(self, result):