Antti Kaijanmäki has proposed merging
lp:~unity-api-team/kubuntu-packaging/qt-purchasing-packaging into
lp:~kubuntu-packagers/kubuntu-packaging/qtpurchasing-opensource-src.
Commit message:
Update backend.
Requested reviews:
Kubuntu Packagers (kubuntu-packagers)
For more details, see:
https://code.launchpad.net/~unity-api-team/kubuntu-packaging/qt-purchasing-packaging/+merge/273815
.
--
Your team Kubuntu Packagers is requested to review the proposed merge of
lp:~unity-api-team/kubuntu-packaging/qt-purchasing-packaging into
lp:~kubuntu-packagers/kubuntu-packaging/qtpurchasing-opensource-src.
=== modified file 'debian/patches/ubuntu_libpay_backend.diff'
--- debian/patches/ubuntu_libpay_backend.diff 2015-10-02 12:57:35 +0000
+++ debian/patches/ubuntu_libpay_backend.diff 2015-10-08 10:55:33 +0000
@@ -194,10 +194,10 @@
+#endif // QUBUNTUINAPPPRODUCT_P_H
diff --git a/src/purchasing/inapppurchase/ubuntu/qubuntuinapppurchasebackend.cpp b/src/purchasing/inapppurchase/ubuntu/qubuntuinapppurchasebackend.cpp
new file mode 100644
-index 0000000..6499124
+index 0000000..89b75b2
--- /dev/null
+++ b/src/purchasing/inapppurchase/ubuntu/qubuntuinapppurchasebackend.cpp
-@@ -0,0 +1,261 @@
+@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
@@ -251,24 +251,25 @@
+
+namespace {
+
-+QString get_appname()
++QString getPackageName()
+{
-+ QString appname;
++ QString pkgname;
+
+ const auto appid = QString::fromUtf8(qgetenv("APP_ID"));
+ if (appid.isEmpty()) {
+ qWarning("$APP_ID environment variable not set.");
-+ return appname;
++ return pkgname;
+ }
+
++ // $APP_ID has the form of <package name>_<application name>_<package version>
+ const auto tokens = appid.split(QStringLiteral("_"));
+ if (tokens.size() != 3) {
+ qWarning() << QString(QStringLiteral("Invalid $APP_ID (%1).")).arg(appid);
-+ return appname;
++ return pkgname;
+ }
+
-+ appname = tokens.at(1);
-+ return appname;
++ pkgname = tokens.at(0);
++ return pkgname;
+}
+
+bool types_equal(QInAppProduct::ProductType qtype, PayItemType utype)
@@ -307,13 +308,13 @@
+
+void QUbuntuInAppPurchaseBackend::initialize()
+{
-+ const auto appname = get_appname();
-+ if (appname.isEmpty()) {
++ const auto pkgname = getPackageName();
++ if (pkgname.isEmpty()) {
+ qWarning("Unable to initialize QUbuntuInAppPurchaseBackend -- appname cannot be found");
+ return;
+ }
+
-+ auto package = pay_package_new(appname.toLocal8Bit().constData());
++ auto package = pay_package_new(qUtf8Printable(pkgname));
+ pay_package_item_observer_install(package, itemObserverStatic, this);
+
+ auto package_deleter = [this](PayPackage *p) {
--
kubuntu-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
