diff options
Diffstat (limited to 'src/dbus/server/pim/edsf-view.cpp')
| -rw-r--r-- | src/dbus/server/pim/edsf-view.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/dbus/server/pim/edsf-view.cpp b/src/dbus/server/pim/edsf-view.cpp index 16972f33..e0c1c531 100644 --- a/src/dbus/server/pim/edsf-view.cpp +++ b/src/dbus/server/pim/edsf-view.cpp @@ -53,7 +53,7 @@ void EDSFView::doStart() ESourceCXX source(e_source_registry_ref_source(m_registry, m_uuid.c_str()), false); if (!source) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: address book not found", m_uuid.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: address book not found", m_uuid.c_str()); return; } m_store = EdsfPersonaStoreCXX::steal(edsf_persona_store_new_with_source_registry(m_registry, source)); @@ -62,12 +62,12 @@ void EDSFView::doStart() // TODO: use asynchronous version, once there is one in EDS if (!getenv("SYNCEVOLUTION_NO_PIM_EDS_DIRECT")) { while (!m_ebook) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: synchronously connecting direct", m_uuid.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: synchronously connecting direct", m_uuid.c_str()); m_ebook = EBookClientCXX::steal(E_BOOK_CLIENT(e_book_client_connect_direct_sync(m_registry, source, NULL, gerror))); if (!m_ebook) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: no DRA client for address book: %s", m_uuid.c_str(), gerror ? gerror->message : "???"); + SE_LOG_DEBUG(NULL, "edsf %s: no DRA client for address book: %s", m_uuid.c_str(), gerror ? gerror->message : "???"); if (gerror && g_error_matches(gerror, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY)) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: try again", m_uuid.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: try again", m_uuid.c_str()); gerror.clear(); } else { return; @@ -80,14 +80,14 @@ void EDSFView::doStart() } #endif - SE_LOG_DEBUG(NULL, NULL, "edsf %s: new client", m_uuid.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: new client", m_uuid.c_str()); m_ebook = EBookClientCXX::steal(e_book_client_new(source, gerror)); if (!m_ebook) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: no normal client for address book: %s", m_uuid.c_str(), gerror ? gerror->message : "???"); + SE_LOG_DEBUG(NULL, "edsf %s: no normal client for address book: %s", m_uuid.c_str(), gerror ? gerror->message : "???"); return; } - SE_LOG_DEBUG(NULL, NULL, "edsf %s: asynchronous open", m_uuid.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: asynchronous open", m_uuid.c_str()); SYNCEVO_GLIB_CALL_ASYNC(e_client_open, boost::bind(&EDSFView::opened, m_self, @@ -102,14 +102,14 @@ void EDSFView::opened(gboolean success, const GError *gerror) throw() { try { if (!success) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: opening failed: %s", m_uuid.c_str(), gerror ? gerror->message : "???"); + SE_LOG_DEBUG(NULL, "edsf %s: opening failed: %s", m_uuid.c_str(), gerror ? gerror->message : "???"); if (gerror && g_error_matches(gerror, E_CLIENT_ERROR, E_CLIENT_ERROR_BUSY)) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: try again", m_uuid.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: try again", m_uuid.c_str()); doStart(); return; } } - SE_LOG_DEBUG(NULL, NULL, "edsf %s: opened successfully, reading contacts asynchronously: %s", m_uuid.c_str(), m_query.c_str()); + SE_LOG_DEBUG(NULL, "edsf %s: opened successfully, reading contacts asynchronously: %s", m_uuid.c_str(), m_query.c_str()); SYNCEVO_GLIB_CALL_ASYNC(e_book_client_get_contacts, boost::bind(&EDSFView::read, m_self, @@ -127,14 +127,14 @@ void EDSFView::opened(gboolean success, const GError *gerror) throw() void EDSFView::read(gboolean success, GSList *contactslist, const GError *gerror) throw() { try { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: reading contacts completed: %s", + SE_LOG_DEBUG(NULL, "edsf %s: reading contacts completed: %s", m_uuid.c_str(), success ? "success" : gerror ? gerror->message : "failed without error"); GListCXX<EContact, GSList, GObjectDestructor> contacts(contactslist); if (!success) { - SE_LOG_DEBUG(NULL, NULL, "edsf %s: reading failed: %s", m_uuid.c_str(), gerror->message); + SE_LOG_DEBUG(NULL, "edsf %s: reading failed: %s", m_uuid.c_str(), gerror->message); return; } |