|
[-]
[+]
|
Changed |
_service:tar_git:libqofono.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libqofono-qt5.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://git.merproject.org/mer-core/libqofono.git</param>
<param name="branch">master</param>
- <param name="revision">76eed1f</param>
+ <param name="revision">0.91</param>
</service>
</services>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libqofono-qt5-0.91.tar.bz2/src/qofonoobject.cpp
^
|
| @@ -287,6 +287,13 @@
}
}
+void QOfonoObject::queryProperties()
+{
+ if (d_ptr->interface) {
+ d_ptr->getProperties(this);
+ }
+}
+
void QOfonoObject::setProperty(const QString &key, const QVariant &value)
{
if (d_ptr->interface) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:libqofono-qt5-0.91.tar.bz2/src/qofonoobject.h
^
|
| @@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2014-2015 Jolla Ltd.
+** Copyright (C) 2014-2016 Jolla Ltd.
** Contact: slava.monich@jolla.com
**
** GNU Lesser General Public License Usage
@@ -69,6 +69,7 @@
void setProperty(const QString &key, const QVariant &value);
bool setPropertySync(const QString &key, const QVariant &value);
+ void queryProperties();
void removeProperty(const QString &key);
QVariantMap getProperties() const;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libqofono-qt5-0.91.tar.bz2/src/qofonosimmanager.cpp
^
|
| @@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013-2015 Jolla Ltd.
+** Copyright (C) 2013-2016 Jolla Ltd.
** Contact: lorn.potter@jollamobile.com
**
** GNU Lesser General Public License Usage
@@ -128,7 +128,25 @@
{
SUPER::propertyChanged(property, value);
if (property == kPresent) {
- Q_EMIT presenceChanged(value.toBool());
+ const bool present = value.toBool();
+ Q_EMIT presenceChanged(present);
+ if (!present) {
+ // Remove all other properties when "Present" becomes false.
+ const QStringList keys = getProperties().keys();
+ const int n = keys.count();
+ for (int i=0; i<n; i++) {
+ const QString &key = keys.at(i);
+ if (key != kPresent) {
+ removeProperty(key);
+ }
+ }
+ } else {
+ // When SIM card is inserted, the properties appear back
+ // but no PropertyChanged event is fired to let us know
+ // what's changed and what didn't. We need to re-read the
+ // properties to keep our cached values up to date.
+ queryProperties();
+ }
} else if (property == kSubscriberIdentity) {
Q_EMIT subscriberIdentityChanged(value.value<QString>());
} else if (property == kMobileCountryCode) {
|
|
[-]
[+]
|
Changed |
_service:tar_git:libqofono-qt5-0.91.tar.bz2/src/version.pri
^
|
| @@ -1 +1 @@
-VERSION = 0.90
+VERSION = 0.91
|
