Merge lp:~super-friends/qml-friends/qml-friends-upload-async into lp:qml-friends

[Ugo Riboni]

Add bindings for uploadForAccountAsync and the uploadComplete signal

Add bindings for uploadForAccountAsync and the uploadComplete signal

[Ken VanDine (ken-vandine)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-28 20:11:08 +0000
+++ debian/changelog	2012-12-06 11:40:30 +0000
@@ -1,3 +1,9 @@
+qml-friends (0.0+r4) UNRELEASED; urgency=low
+
+  * Added uploadForAccountAsync and uploadComplete signal
+
+ -- Ugo Riboni <[e-mail]>  Thu, 06 Dec 2012 11:37:09 +0000
+
 qml-friends (0.0+r3) quantal; urgency=low
 
   * Rev 3

=== modified file 'modules/Friends/plugin/friendsservice.cpp'
--- modules/Friends/plugin/friendsservice.cpp	2012-11-28 19:59:10 +0000
+++ modules/Friends/plugin/friendsservice.cpp	2012-12-06 11:40:30 +0000
@@ -68,3 +68,29 @@
     return friends_service_upload(m_service, acct.data(), path.data(), desc.data());
 }
 
+void FriendsServiceQml::uploadCompleteCallback(GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+    Q_UNUSED(source_object);
+
+    FriendsServiceQml* service = (FriendsServiceQml*) user_data;
+    if (service) {
+        gchar* result_url;
+        GError* error = NULL;
+        bool success = friends_service_upload_finish(service->m_service, res, &result_url, &error);
+        QString errorMessage;
+        if (!success) {
+            errorMessage = QString::fromUtf8(error->message);
+        }
+        Q_EMIT service->uploadComplete(QString::fromUtf8(result_url), success, errorMessage);
+    }
+}
+
+void FriendsServiceQml::uploadForAccountAsync(const QString& account_id, const QString& uri, const QString& description) const
+{
+    QByteArray acct = account_id.toUtf8();
+    QByteArray path = uri.toUtf8();
+    QByteArray desc = description.toUtf8();
+    friends_service_upload_async(m_service, acct.data(), path.data(), desc.data(),
+                                 &uploadCompleteCallback, (gpointer) this);
+}
+

=== modified file 'modules/Friends/plugin/friendsservice.h'
--- modules/Friends/plugin/friendsservice.h	2012-11-28 19:59:10 +0000
+++ modules/Friends/plugin/friendsservice.h	2012-12-06 11:40:30 +0000
@@ -37,8 +37,13 @@
     QStringList featuresForProtocol(const QString& protocol) const;
     bool sendForAccount(const QString& account, const QString& message) const;
     bool uploadForAccount(const QString& account_id, const QString& uri, const QString& description) const;
+    void uploadForAccountAsync(const QString& account_id, const QString& uri, const QString& description) const;
+
+Q_SIGNALS:
+    void uploadComplete(QString resultUrl, bool success, QString errorMessage);
 
 private:
+    static void uploadCompleteCallback(GObject *source_object, GAsyncResult *res, gpointer user_data);
     FriendsService* m_service;
 };