From 3f169162e6ab7131b2f15b1f3af7083f6d79b1e6 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Thu, 18 Nov 2010 09:22:52 -0500
Subject: [PATCH] #4495: Rework addressbook opening loop
---
sflphone-client-gnome/src/contacts/addressbook.c | 4 +---
sflphone-common/src/audio/audiortp/AudioRtpSession.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sflphone-client-gnome/src/contacts/addressbook.c b/sflphone-client-gnome/src/contacts/addressbook.c
index 7a4290093e..b37b1e48d5 100644
--- a/sflphone-client-gnome/src/contacts/addressbook.c
+++ b/sflphone-client-gnome/src/contacts/addressbook.c
@@ -114,10 +114,8 @@ addressbook_config_books()
// If book_data exists
if (!book_data) {
ERROR ("Addressbook: Error: Could not open book (%s:%d)", __FILE__, __LINE__);
- continue;
+ book_data->active = TRUE;
}
-
- book_data->active = TRUE;
}
g_strfreev (list);
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
index 68368b36eb..29295ad4c4 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.cpp
@@ -243,7 +243,7 @@ void AudioRtpSession::sendMicData()
_timestampCount++;
- // Reset timestamp to make sure the timing information are up to date
+ // Reset timestamp to make sure the timinlipg information are up to date
if (_timestampCount > RTP_TIMESTAMP_RESET_FREQ) {
_timestamp = getCurrentTimestamp();
_timestampCount = 0;
--
GitLab