Hello community, here is the log from the commit of package libModemManagerQt for openSUSE:Factory checked in at 2013-09-16 10:05:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libModemManagerQt (Old) and /work/SRC/openSUSE:Factory/.libModemManagerQt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libModemManagerQt" Changes: -------- --- /work/SRC/openSUSE:Factory/libModemManagerQt/libModemManagerQt.changes 2013-09-11 15:42:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libModemManagerQt.new/libModemManagerQt.changes 2013-09-16 10:05:25.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 15 22:01:05 UTC 2013 - [email protected] + +- Update to 0.5.1 + * Upgrade ModemGsmCardInterface to 0.5 +- Add Source URL + +------------------------------------------------------------------- Old: ---- libmm-qt-0.5.0.tar.xz New: ---- libmm-qt-0.5.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libModemManagerQt.spec ++++++ --- /var/tmp/diff_new_pack.oA6dJ7/_old 2013-09-16 10:05:27.000000000 +0200 +++ /var/tmp/diff_new_pack.oA6dJ7/_new 2013-09-16 10:05:27.000000000 +0200 @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Url: http://www.kde.org %define soversion 0 Name: libModemManagerQt -Version: 0.5.0 +Version: 0.5.1 Release: 0 -License: LGPL-2.1 or LGPL-3.0 Summary: Qt wrapper for ModemManager DBus API +License: LGPL-2.1 or LGPL-3.0 Group: System/GUI/KDE -Source0: libmm-qt-%{version}.tar.xz +Source0: http://download.kde.org/unstable/modemmanager-qt/0.5.1/src/libmm-qt-%{version}.tar.xz BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libqt4-devel @@ -45,14 +46,12 @@ Summary: Qt wrapper around the ModemManager libraries Group: Development/Libraries/KDE - %description -n libModemManagerQt%{soversion} Qt wrapper for ModemManager DBus API. %prep %setup -q -n libmm-qt-%{version} - %build %cmake_kde4 -d build %make_jobs ++++++ libmm-qt-0.5.0.tar.xz -> libmm-qt-0.5.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/CMakeLists.txt new/libmm-qt-0.5.1/CMakeLists.txt --- old/libmm-qt-0.5.0/CMakeLists.txt 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/CMakeLists.txt 2013-09-15 23:13:00.000000000 +0200 @@ -2,7 +2,7 @@ project(ModemManagerQt) -set(VERSION 0.5.0) +set(VERSION 0.5.1) set(CMAKE_BUILD_TYPE Debug) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/dbus/introspection/mm-modem-gsm-card.xml new/libmm-qt-0.5.1/dbus/introspection/mm-modem-gsm-card.xml --- old/libmm-qt-0.5.0/dbus/introspection/mm-modem-gsm-card.xml 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/dbus/introspection/mm-modem-gsm-card.xml 2013-09-15 23:13:00.000000000 +0200 @@ -4,97 +4,132 @@ <interface name="org.freedesktop.ModemManager.Modem.Gsm.Card"> <method name="GetImei"> <tp:docstring> - Get the IMEI of the card. + Get the IMEI of the card. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_imei"/> <arg name="imei" type="s" direction="out"> - <tp:docstring> - The IMEI. - </tp:docstring> + <tp:docstring> + The IMEI. + </tp:docstring> </arg> </method> <method name="GetImsi"> <tp:docstring> - Get the IMSI of the SIM card. + Get the IMSI of the SIM card. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_imsi"/> <arg name="imsi" type="s" direction="out"> - <tp:docstring> - The IMSI. - </tp:docstring> + <tp:docstring> + The IMSI. + </tp:docstring> + </arg> + </method> + + <method name="GetOperatorId"> + <tp:docstring> + Returns the ID of the network operator that issued the SIM card, + formatted as a 5 or 6-digit MCC/MNC code (ex "310410"). + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_operator_id"/> + <arg name="imsi" type="s" direction="out"> + <tp:docstring> + The operator ID formatted as an MCC/MNC code. + </tp:docstring> + </arg> + </method> + + <method name="GetSpn"> + <tp:docstring> + Returns the SPN (Service Provider Name) from the SIM card, + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_spn"/> + <arg name="spn" type="s" direction="out"> + <tp:docstring> + The Service Provider Name. + </tp:docstring> </arg> </method> <method name="SendPuk"> <tp:docstring> - Send the PUK and a new PIN to unlock the SIM card. + Send the PUK and a new PIN to unlock the SIM card. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_send_puk"/> <arg name="puk" type="s" direction="in"> - <tp:docstring> - The PUK code. - </tp:docstring> + <tp:docstring> + The PUK code. + </tp:docstring> </arg> <arg name="pin" type="s" direction="in"> - <tp:docstring> - The PIN code. - </tp:docstring> + <tp:docstring> + The PIN code. + </tp:docstring> </arg> </method> <method name="SendPin"> <tp:docstring> - Send the PIN (or PUK) to unlock the SIM card. + Send the PIN to unlock the SIM card. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_send_pin"/> <arg name="pin" type="s" direction="in"> - <tp:docstring> - The PIN code. - </tp:docstring> + <tp:docstring> + The PIN code. + </tp:docstring> </arg> </method> <method name="EnablePin"> <tp:docstring> - Enable or disable the PIN checking. + Enable or disable the PIN checking. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_enable_pin"/> <arg name="pin" type="s" direction="in"> - <tp:docstring> - The PIN code. - </tp:docstring> + <tp:docstring> + The PIN code. + </tp:docstring> </arg> <arg name="enabled" type="b" direction="in"> - <tp:docstring> - True to enable PIN checking. - </tp:docstring> + <tp:docstring> + True to enable PIN checking. + </tp:docstring> </arg> </method> <method name="ChangePin"> <tp:docstring> - Change the PIN code. + Change the PIN code. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_change_pin"/> <arg name="old_pin" type="s" direction="in"> - <tp:docstring> - The current PIN code. - </tp:docstring> + <tp:docstring> + The current PIN code. + </tp:docstring> </arg> <arg name="new_pin" type="s" direction="in"> - <tp:docstring> - The new PIN code. - </tp:docstring> + <tp:docstring> + The new PIN code. + </tp:docstring> </arg> </method> + <property name="SimIdentifier" type="s" access="read"> + <tp:docstring> + An obfuscated SIM identifier based on the IMSI or the ICCID. This may + be available before the PIN has been entered depending on the device + itself. + </tp:docstring> + </property> + <property name="SupportedBands" type="u" access="read" tp:type="Band"> <tp:docstring> Bands supported by the card. (Note for plugin writers: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/dbus/mm-modem-gsm-cardinterface.cpp new/libmm-qt-0.5.1/dbus/mm-modem-gsm-cardinterface.cpp --- old/libmm-qt-0.5.0/dbus/mm-modem-gsm-cardinterface.cpp 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/dbus/mm-modem-gsm-cardinterface.cpp 2013-09-15 23:13:00.000000000 +0200 @@ -1,8 +1,8 @@ /* * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -m -p mm-modem-gsm-cardinterface /home/ilia/libnm-qt/libmm-qt/dbus/introspection/mm-modem-gsm-card.xml + * Command line was: qdbusxml2cpp -m -N -p mm-modem-gsm-cardinterface introspection/mm-modem-gsm-card.xml * - * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/dbus/mm-modem-gsm-cardinterface.h new/libmm-qt-0.5.1/dbus/mm-modem-gsm-cardinterface.h --- old/libmm-qt-0.5.0/dbus/mm-modem-gsm-cardinterface.h 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/dbus/mm-modem-gsm-cardinterface.h 2013-09-15 23:13:00.000000000 +0200 @@ -1,8 +1,8 @@ /* * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -m -p mm-modem-gsm-cardinterface /home/ilia/libnm-qt/solid/modemmanager-0.4/dbus/introspection/mm-modem-gsm-card.xml + * Command line was: qdbusxml2cpp -m -N -p mm-modem-gsm-cardinterface introspection/mm-modem-gsm-card.xml * - * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. @@ -36,6 +36,10 @@ ~OrgFreedesktopModemManagerModemGsmCardInterface(); + Q_PROPERTY(QString SimIdentifier READ simIdentifier) + inline QString simIdentifier() const + { return qvariant_cast< QString >(property("SimIdentifier")); } + Q_PROPERTY(uint SupportedBands READ supportedBands) inline uint supportedBands() const { return qvariant_cast< uint >(property("SupportedBands")); } @@ -48,14 +52,14 @@ inline QDBusPendingReply<> ChangePin(const QString &old_pin, const QString &new_pin) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(old_pin) << qVariantFromValue(new_pin); + argumentList << QVariant::fromValue(old_pin) << QVariant::fromValue(new_pin); return asyncCallWithArgumentList(QLatin1String("ChangePin"), argumentList); } inline QDBusPendingReply<> EnablePin(const QString &pin, bool enabled) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(pin) << qVariantFromValue(enabled); + argumentList << QVariant::fromValue(pin) << QVariant::fromValue(enabled); return asyncCallWithArgumentList(QLatin1String("EnablePin"), argumentList); } @@ -71,17 +75,29 @@ return asyncCallWithArgumentList(QLatin1String("GetImsi"), argumentList); } + inline QDBusPendingReply<QString> GetOperatorId() + { + QList<QVariant> argumentList; + return asyncCallWithArgumentList(QLatin1String("GetOperatorId"), argumentList); + } + + inline QDBusPendingReply<QString> GetSpn() + { + QList<QVariant> argumentList; + return asyncCallWithArgumentList(QLatin1String("GetSpn"), argumentList); + } + inline QDBusPendingReply<> SendPin(const QString &pin) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(pin); + argumentList << QVariant::fromValue(pin); return asyncCallWithArgumentList(QLatin1String("SendPin"), argumentList); } inline QDBusPendingReply<> SendPuk(const QString &puk, const QString &pin) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(puk) << qVariantFromValue(pin); + argumentList << QVariant::fromValue(puk) << QVariant::fromValue(pin); return asyncCallWithArgumentList(QLatin1String("SendPuk"), argumentList); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/modemgsmcardinterface.cpp new/libmm-qt-0.5.1/modemgsmcardinterface.cpp --- old/libmm-qt-0.5.0/modemgsmcardinterface.cpp 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/modemgsmcardinterface.cpp 2013-09-15 23:13:00.000000000 +0200 @@ -34,6 +34,10 @@ { Q_D(ModemGsmCardInterface); + d->supportedBands = (ModemManager::ModemInterface::Band) d->modemGsmCardIface.supportedBands(); + d->supportedModes = (ModemManager::ModemInterface::Mode) d->modemGsmCardIface.supportedModes(); + d->simIdentifier = d->modemGsmCardIface.simIdentifier(); + d->modemGsmCardIface.connection().connect(ModemManager::DBUS_SERVICE, path, QLatin1String("org.freedesktop.DBus.Properties"), QLatin1String("MmPropertiesChanged"), QLatin1String("sa{sv}"), @@ -52,14 +56,24 @@ if (interface == QString("org.freedesktop.ModemManager.Modem.Gsm.Card")) { QLatin1String supportedBands("SupportedBands"); QLatin1String supportedModes("SupportedModes"); + QLatin1String simIdentifier("SimIdentifier"); + + Q_D(ModemGsmCardInterface); QVariantMap::const_iterator it = properties.find(supportedBands); if ( it != properties.end()) { - emit supportedBandsChanged((ModemManager::ModemInterface::Band) it->toInt()); + d->supportedBands = (ModemManager::ModemInterface::Band) it->toInt(); + emit supportedBandsChanged(d->supportedBands); } it = properties.find(supportedModes); if ( it != properties.end()) { - emit supportedModesChanged((ModemManager::ModemInterface::Mode) it->toInt()); + d->supportedModes = (ModemManager::ModemInterface::Mode) it->toInt(); + emit supportedModesChanged(d->supportedModes); + } + it = properties.find(simIdentifier); + if ( it != properties.end()) { + d->simIdentifier = it->toString(); + emit simIdentifierChanged(d->simIdentifier); } } } @@ -88,6 +102,18 @@ return QString(); } +QDBusPendingReply<QString> ModemManager::ModemGsmCardInterface::operatorId() +{ + Q_D(ModemGsmCardInterface); + return d->modemGsmCardIface.GetOperatorId(); +} + +QDBusPendingReply<QString> ModemManager::ModemGsmCardInterface::serviceProviderName() +{ + Q_D(ModemGsmCardInterface); + return d->modemGsmCardIface.GetSpn(); +} + QDBusPendingReply<> ModemManager::ModemGsmCardInterface::sendPuk(const QString & puk, const QString & pin) { Q_D(ModemGsmCardInterface); @@ -115,14 +141,17 @@ ModemManager::ModemInterface::Band ModemManager::ModemGsmCardInterface::getSupportedBands() const { Q_D(const ModemGsmCardInterface); - return (ModemManager::ModemInterface::Band) d->modemGsmCardIface.supportedBands(); + return d->supportedBands; } ModemManager::ModemInterface::Mode ModemManager::ModemGsmCardInterface::getSupportedModes() const { Q_D(const ModemGsmCardInterface); - return (ModemManager::ModemInterface::Mode) d->modemGsmCardIface.supportedModes(); + return d->supportedModes; } - - +QString ModemManager::ModemGsmCardInterface::simIdentifier() const +{ + Q_D(const ModemGsmCardInterface); + return d->simIdentifier; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/modemgsmcardinterface.h new/libmm-qt-0.5.1/modemgsmcardinterface.h --- old/libmm-qt-0.5.0/modemgsmcardinterface.h 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/modemgsmcardinterface.h 2013-09-15 23:13:00.000000000 +0200 @@ -45,6 +45,8 @@ QString getImei(); QString getImsi(); + QDBusPendingReply<QString> serviceProviderName(); + QDBusPendingReply<QString> operatorId(); QDBusPendingReply<> sendPuk(const QString & puk, const QString & pin); QDBusPendingReply<> sendPin(const QString & pin); QDBusPendingReply<> enablePin(const QString & pin, bool enabled); @@ -53,10 +55,12 @@ // Properties ModemManager::ModemInterface::Band getSupportedBands() const; // deprecated ModemManager::ModemInterface::Mode getSupportedModes() const; + QString simIdentifier() const; Q_SIGNALS: // properties void supportedBandsChanged(const ModemManager::ModemInterface::Band band); void supportedModesChanged(const ModemManager::ModemInterface::Mode modes); + void simIdentifierChanged(const QString &simIdentifier); private Q_SLOTS: void propertiesChanged(const QString & interface, const QVariantMap & properties); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmm-qt-0.5.0/modemgsmcardinterface_p.h new/libmm-qt-0.5.1/modemgsmcardinterface_p.h --- old/libmm-qt-0.5.0/modemgsmcardinterface_p.h 2013-09-09 22:34:49.000000000 +0200 +++ new/libmm-qt-0.5.1/modemgsmcardinterface_p.h 2013-09-15 23:13:00.000000000 +0200 @@ -24,12 +24,17 @@ #include "modeminterface_p.h" #include "dbus/mm-modem-gsm-cardinterface.h" +#include "modeminterface.h" class ModemGsmCardInterfacePrivate: public ModemInterfacePrivate { public: ModemGsmCardInterfacePrivate(const QString &path, QObject *owner); OrgFreedesktopModemManagerModemGsmCardInterface modemGsmCardIface; + + ModemManager::ModemInterface::Band supportedBands; + ModemManager::ModemInterface::Mode supportedModes; + QString simIdentifier; }; #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
