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

PIM: typo quiesent -> quiescent

Browse source 
The typo affected both internal variables and the API's "Quiescent"
signal. "Quiescence" was also spelled wrong.
This commit is contained in:
Patrick Ohly 2012-11-16 18:11:57 +01:00
parent 1b18051270
commit b89b37fc8c
5 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dbus/server/pim/examples/search.py
View file

@ -261,7 +261,7 @@ class ContactsView(dbus.service.Object):
@nothrow
@dbus.service.method(dbus_interface='org._01.pim.contacts.ViewAgent',
in_signature='o', out_signature='')
def Quiesent(self, view):
def Quiescent(self, view):
if options.verbosity >= VERBOSITY_NOTIFICATIONS:
print 'view is stable'

26
src/dbus/server/pim/folks.cpp
View file

@ -240,7 +240,7 @@ void FullView::doStart()
_2, _3, _4, _5, _6));
m_folks.connectSignal<void (GObject *gobject,
GParamSpec *pspec)>("notify::is-quiescent",
boost::bind(&FullView::quiesenceChanged,
boost::bind(&FullView::quiescenceChanged,
m_self));
@ -297,15 +297,15 @@ void FullView::individualModified(gpointer gobject,
waitForIdle();
}
void FullView::quiesenceChanged()
void FullView::quiescenceChanged()
{
bool quiesent = folks_individual_aggregator_get_is_quiescent(m_folks);
SE_LOG_DEBUG(NULL, NULL, "aggregator is %s", quiesent ? "quiesent" : "busy");
// In practice, libfolks only switches from "busy" to "quiesent"
bool quiescent = folks_individual_aggregator_get_is_quiescent(m_folks);
SE_LOG_DEBUG(NULL, NULL, "aggregator is %s", quiescent ? "quiescent" : "busy");
// In practice, libfolks only switches from "busy" to "quiescent"
// once. See https://bugzilla.gnome.org/show_bug.cgi?id=684766
// "enter and leave quiesence state".
if (quiesent) {
m_quiesenceSignal();
// "enter and leave quiescence state".
if (quiescent) {
m_quiescenceSignal();
}
}
@ -404,7 +404,7 @@ void FullView::onIdle()
}
m_pendingModifications.clear();
m_quiesenceSignal();
m_quiescenceSignal();
m_waitForIdle.deactivate();
}
@ -448,7 +448,7 @@ void FullView::setCompare(const boost::shared_ptr<IndividualCompare> &compare)
}
// Current status is stable again, send out all modifications.
m_quiesenceSignal();
m_quiescenceSignal();
}
FilteredView::FilteredView(const boost::shared_ptr<IndividualView> &parent,
@ -461,7 +461,7 @@ FilteredView::FilteredView(const boost::shared_ptr<IndividualView> &parent,
void FilteredView::init(const boost::shared_ptr<FilteredView> &self)
{
m_self = self;
m_parent->m_quiesenceSignal.connect(QuiesenceSignal_t::slot_type(boost::bind(boost::cref(m_quiesenceSignal))).track(m_self));
m_parent->m_quiescenceSignal.connect(QuiescenceSignal_t::slot_type(boost::bind(boost::cref(m_quiescenceSignal))).track(m_self));
}
boost::shared_ptr<FilteredView> FilteredView::create(const boost::shared_ptr<IndividualView> &parent,
@ -484,7 +484,7 @@ void FilteredView::doStart()
// No more changes expected for a while, because usually a FilteredView
// is a search on a stable FullView. Notify listeners. Necessary to
// get changes flushed.
m_quiesenceSignal();
m_quiescenceSignal();
// Start listening to signals.
m_parent->m_addedSignal.connect(ChangeSignal_t::slot_type(boost::bind(&FilteredView::addIndividual, this, _1, _2)).track(m_self));
@ -507,7 +507,7 @@ void FilteredView::refineFilter(const boost::shared_ptr<IndividualFilter> &indiv
}
}
m_filter = individualFilter;
m_quiesenceSignal();
m_quiescenceSignal();
}
void FilteredView::addIndividual(int parentIndex, FolksIndividual *individual)

14
src/dbus/server/pim/folks.h
View file

@ -167,13 +167,13 @@ class IndividualView
public:
typedef boost::signals2::signal<void (int, FolksIndividual *)> ChangeSignal_t;
typedef boost::signals2::signal<void (void)> QuiesenceSignal_t;
typedef boost::signals2::signal<void (void)> QuiescenceSignal_t;
/**
* Triggered each time the view reaches a quiesence state, meaning
* Triggered each time the view reaches a quiescence state, meaning
* that its current content is stable, at least for now.
*/
QuiesenceSignal_t m_quiesenceSignal;
QuiescenceSignal_t m_quiescenceSignal;
/**
* A new FolksIndividual was added at a specific index. This
@ -292,18 +292,18 @@ class FullView : public IndividualView
GParamSpec *pspec);
/**
* FolksIndividualAggregator "is-quiesent" property change slot.
* FolksIndividualAggregator "is-quiescent" property change slot.
*
* It turned out that "quiesence" is only set to true once in
* It turned out that "quiescence" is only set to true once in
* FolksIndividualAggregator. The code which watches that signal
* is still in place, but it will only get invoked once.
*
* Therefore the main mechanism for emitting m_quiesenceSignal in
* Therefore the main mechanism for emitting m_quiescenceSignal in
* FullView is an idle callback which gets invoked each time the
* daemon has nothing to do, which implies that (at least for now)
* libfolks has no pending work to do.
*/
void quiesenceChanged();
void quiescenceChanged();
/**
* Add a FolksIndividual. Starts monitoring it for changes.

18
src/dbus/server/pim/manager.cpp
View file

@ -206,7 +206,7 @@ class ViewResource : public Resource, public GDBusCXX::DBusObjectHelper
std::deque<std::string> m_ids;
const GDBusCXX::DBusClientCall0 *m_call;
} m_pendingChange, m_lastChange;
GDBusCXX::DBusClientCall0 m_quiesent;
GDBusCXX::DBusClientCall0 m_quiescent;
GDBusCXX::DBusClientCall0 m_contactsModified,
m_contactsAdded,
m_contactsRemoved;
@ -229,7 +229,7 @@ class ViewResource : public Resource, public GDBusCXX::DBusObjectHelper
m_owner(owner),
// use ViewAgent interface
m_quiesent(m_viewAgent, "Quiesent"),
m_quiescent(m_viewAgent, "Quiescent"),
m_contactsModified(m_viewAgent, "ContactsModified"),
m_contactsAdded(m_viewAgent, "ContactsAdded"),
m_contactsRemoved(m_viewAgent, "ContactsRemoved")
@ -445,13 +445,13 @@ class ViewResource : public Resource, public GDBusCXX::DBusObjectHelper
}
/** Current state is stable. Flush and tell agent. */
void quiesent()
void quiescent()
{
flushChanges();
m_quiesent.start(getObject(),
boost::bind(ViewResource::sendDone,
m_self,
_1));
m_quiescent.start(getObject(),
boost::bind(ViewResource::sendDone,
m_self,
_1));
}
/**
@ -497,8 +497,8 @@ class ViewResource : public Resource, public GDBusCXX::DBusObjectHelper
}
sendChange(m_contactsAdded, 0, ids);
}
m_view->m_quiesenceSignal.connect(IndividualView::QuiesenceSignal_t::slot_type(&ViewResource::quiesent,
this).track(self));
m_view->m_quiescenceSignal.connect(IndividualView::QuiescenceSignal_t::slot_type(&ViewResource::quiescent,
this).track(self));
m_view->m_modifiedSignal.connect(IndividualView::ChangeSignal_t::slot_type(&ViewResource::handleChange,
this,
boost::cref(m_contactsModified),

52
src/dbus/server/pim/testpim.py
View file

@ -73,8 +73,8 @@ class ContactsView(dbus.service.Object, unittest.TestCase):
self.contacts = []
# Change events, as list of ("modified/added/removed", start, count).
self.events = []
# Number of times that ViewAgent.Quiesent() was called.
self.quiesentCount = 0
# Number of times that ViewAgent.Quiescent() was called.
self.quiescentCount = 0
dbus.service.Object.__init__(self, dbus.SessionBus(), self.path)
unittest.TestCase.__init__(self)
@ -176,8 +176,8 @@ class ContactsView(dbus.service.Object, unittest.TestCase):
@dbus.service.method(dbus_interface='org._01.pim.contacts.ViewAgent',
in_signature='o', out_signature='')
def Quiesent(self, view):
self.quiesentCount = self.quiesentCount + 1
def Quiescent(self, view):
self.quiescentCount = self.quiescentCount + 1
def read(self, start, count=1):
'''Read the specified range of contact data.'''
@ -1373,7 +1373,7 @@ END:VCARD''']):
view.search([['any-contains', 'chÁrles']])
self.runUntil('charles search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('charles',
@ -1392,7 +1392,7 @@ END:VCARD''']):
view.search([['any-contains', 'chÁrless', 'case-insensitive']])
self.runUntil('charles search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('charles',
@ -1405,7 +1405,7 @@ END:VCARD''']):
view.search([['any-contains', 'Chárleß', 'case-sensitive']])
self.runUntil('charles search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('charles',
@ -1418,7 +1418,7 @@ END:VCARD''']):
view.search([['any-contains', 'charles', 'case-sensitive']])
self.runUntil('charles search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(0, len(view.contacts))
# Find Abraham and Benjamin.
@ -1426,7 +1426,7 @@ END:VCARD''']):
view.search([['any-contains', 'am']])
self.runUntil('"am" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(2, len(view.contacts))
view.read(0, 2)
self.runUntil('two contacts',
@ -1436,22 +1436,22 @@ END:VCARD''']):
self.assertEqual(u'Benjamin', view.contacts[1]['structured-name']['given'])
# Refine search without actually changing the result.
view.quiesentCount = 0
view.quiescentCount = 0
view.view.RefineSearch([['any-contains', 'am']],
timeout=self.timeout)
self.runUntil('end of search refinement',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(u'Abraham', view.contacts[0]['structured-name']['given'])
self.assertEqual(u'Benjamin', view.contacts[1]['structured-name']['given'])
# Restrict search to Abraham.
view.quiesentCount = 0
view.quiescentCount = 0
view.view.RefineSearch([['any-contains', 'Abraham']],
timeout=self.timeout)
self.runUntil('end of search refinement',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
self.assertEqual(u'Abraham', view.contacts[0]['structured-name']['given'])
@ -1460,7 +1460,7 @@ END:VCARD''']):
view.search([['any-contains', 'ace']])
self.runUntil('"ace" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('two contacts',
@ -1473,7 +1473,7 @@ END:VCARD''']):
view.search([['any-contains', 'az@']])
self.runUntil('"az@" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('two contacts',
@ -1486,7 +1486,7 @@ END:VCARD''']):
view.search([['any-contains', '1234']])
self.runUntil('"1234" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('1234 data',
@ -1499,7 +1499,7 @@ END:VCARD''']):
view.search([['any-contains', '23']])
self.runUntil('"23" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('23 data',
@ -1513,7 +1513,7 @@ END:VCARD''']):
view.search([['any-contains', '12/34']])
self.runUntil('"12/34" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('12/34 data',
@ -1527,7 +1527,7 @@ END:VCARD''']):
view.search([['any-contains', '5678']])
self.runUntil('"5678" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('5678 data',
@ -1540,7 +1540,7 @@ END:VCARD''']):
view.search([['any-contains', '+1-800-foobar']])
self.runUntil('"+1-800-foobar" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('+1-800-foobar data',
@ -1554,7 +1554,7 @@ END:VCARD''']):
view.search([['any-contains', '366227']])
self.runUntil('"366227" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('366227 data',
@ -1567,7 +1567,7 @@ END:VCARD''']):
view.search([['phone', '+1800366227']])
self.runUntil('"+1800366227" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('+1800366227 data',
@ -1580,7 +1580,7 @@ END:VCARD''']):
view.search([['phone', '+49897888']])
self.runUntil('"+49897888" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('+49897888 data',
@ -1593,7 +1593,7 @@ END:VCARD''']):
view.search([['phone', '0897888']])
self.runUntil('"0897888" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(1, len(view.contacts))
view.read(0, 1)
self.runUntil('0897888 data',
@ -1606,7 +1606,7 @@ END:VCARD''']):
view.search([['phone', '+49897888000']])
self.runUntil('"+49897888000" search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(0, len(view.contacts))
@timeout(60)
@ -1623,7 +1623,7 @@ END:VCARD''']):
view.search([['any-contains', 'chÁrles']])
self.runUntil('charles search results',
check=lambda: self.assertEqual([], view.errors),
until=lambda: view.quiesentCount > 0)
until=lambda: view.quiescentCount > 0)
self.assertEqual(0, len(view.contacts))
# Insert new contacts.