---
src/dialerkeypad.cpp | 18 +++++++++---------
src/historytablemodel.cpp | 4 +++-
src/src.pro | 7 ++++---
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/dialerkeypad.cpp b/src/dialerkeypad.cpp
index 36ad42c..1e37c1c 100644
--- a/src/dialerkeypad.cpp
+++ b/src/dialerkeypad.cpp
@@ -124,7 +124,7 @@ DialerKeyPad::DialerKeyPad(DialerKeypadType keypadType,
m_optionBox(new MStylableWidget()),
m_mute(new MButton("Mute")),
m_hold(new MButton("Hold")),
- m_spkr(new MButton("Speaker")),
+ m_audiosink(new MButton("Speaker")),
m_nway(new MButton("Merge Calls")),
m_buttonBox(new MStylableWidget()),
m_controlBox(new MStylableWidget()),
@@ -340,13 +340,13 @@ void DialerKeyPad::createOptionBox()
m_hold->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::MinimumExpanding));
- m_spkr->setObjectName("speakerButton");
- m_spkr->setViewType(MButton::toggleType);
- m_spkr->setCheckable(true);
+ m_audiosink->setObjectName("speakerButton");
+ m_audiosink->setViewType(MButton::toggleType);
+ m_audiosink->setCheckable(true);
// m_spkr->setIconID("icon-dialer-speaker");
// m_spkr->setToggledIconID("icon-dialer-speaker-on");
- m_spkr->setEnabled(false);
- m_spkr->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
+ m_audiosink->setEnabled(false);
+ m_audiosink->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
QSizePolicy::MinimumExpanding));
m_nway->setObjectName("multiButton");
@@ -359,12 +359,12 @@ void DialerKeyPad::createOptionBox()
policy->insertItem(0, m_hold, Qt::AlignHCenter|Qt::AlignBottom);
policy->insertItem(1, m_mute, Qt::AlignHCenter|Qt::AlignBottom);
- policy->insertItem(2, m_spkr, Qt::AlignHCenter|Qt::AlignBottom);
+ policy->insertItem(2, m_audiosink, Qt::AlignHCenter|Qt::AlignBottom);
policy->insertItem(3, m_nway, Qt::AlignHCenter|Qt::AlignBottom);
connect(m_mute, SIGNAL(clicked(bool)), SLOT(mutePressed(bool)));
connect(m_hold, SIGNAL(clicked(bool)), SLOT(holdPressed(bool)));
- connect(m_spkr, SIGNAL(clicked(bool)), SLOT(spkrPressed(bool)));
+ connect(m_audiosink, SIGNAL(clicked(bool)), SLOT(audiosinkPressed(bool)));
connect(m_nway, SIGNAL(clicked(bool)), SLOT(nwayPressed(bool)));
}
@@ -632,7 +632,7 @@ void DialerKeyPad::holdPressed(bool checked)
updateButtonStates();
}
-void DialerKeyPad::spkrPressed(bool checked)
+void DialerKeyPad::audiosinkPressed(bool checked)
{
TRACE
if (checked)
diff --git a/src/historytablemodel.cpp b/src/historytablemodel.cpp
index 42735ce..c69bcf6 100644
--- a/src/historytablemodel.cpp
+++ b/src/historytablemodel.cpp
@@ -108,7 +108,9 @@ bool HistoryTableModel::insertRows(int row, int count,
int i = 0;
QStringList newRow = QStringList();
ManagerProxy *mp = ManagerProxy::instance();
- QSettings *cache = mp->history()->cache();
+ HistoryProxy* historyProxy = mp->history();
+ if(!historyProxy) return false; //abort
+ QSettings *cache = historyProxy->cache();
cache->beginGroup("CallHistory");
QStringList events = cache->childGroups();
diff --git a/src/src.pro b/src/src.pro
index 7bad58a..2107ecb 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,9 @@
include (../common.pri)
TEMPLATE = app
-QT += dbus opengl
-CONFIG += qdbus mobility
-PKGCONFIG += QtNetwork QtContacts
+QT += dbus opengl network
+CONFIG += qdbus mobility link_pkgconfig
+#MOBILITY += contacts
+PKGCONFIG += QtContacts QtNetwork
MOC_DIR = .moc
OBJECTS_DIR = .obj
MGEN_OUTDIR = .gen
--
1.7.1
_______________________________________________
MeeGo-dev mailing list
[email protected]
http://lists.meego.com/listinfo/meego-dev
