Merge lp:~aacid/unity/new_hud_client_api into lp:unity/phablet

[Albert Astals Cid]

Use the new API that signals models have changed

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:526
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/225/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/101/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/225/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:527
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/228/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/104/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/228/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Mark as Work In Progress until the hud-client2 package lands

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:528
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/770/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/646
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/650

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/770/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

=== modified file 'plugins/HudClient/hudclient.cpp'
--- plugins/HudClient/hudclient.cpp	2013-04-08 08:26:48 +0000
+++ plugins/HudClient/hudclient.cpp	2013-04-26 08:09:29 +0000
@@ -61,6 +61,11 @@
   static_cast<HudClient*>(dst)->modelReallyReady(true);
 }
 
+static void modelsChangedCB(GObject* /*src*/, gpointer dst)
+{
+  static_cast<HudClient*>(dst)->queryModelsChanged();
+}
+
 } // extern "C"
 
 } // namespace
@@ -79,6 +84,7 @@
   g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-heard-something", G_CALLBACK(heardSomethingCB), this);
   g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-finished", G_CALLBACK(finishedCB), this);
   g_signal_connect(G_OBJECT(m_clientQuery), "voice-query-failed", G_CALLBACK(failedCB), this);
+  g_signal_connect(G_OBJECT(m_clientQuery), HUD_CLIENT_QUERY_SIGNAL_MODELS_CHANGED, G_CALLBACK(modelsChangedCB), this);
 }
 
 // Terrible hack to get around GLib. GLib stores function pointers as gpointer, which violates the C and C++ spec
@@ -301,3 +307,9 @@
   g_variant_unref(actionTextVariant);
   Q_EMIT showParametrizedAction(actionText, QVariant::fromValue(items));
 }
+
+void HudClient::queryModelsChanged()
+{
+  m_results->setModel(hud_client_query_get_results_model(m_clientQuery));
+  m_applicationsStack->setModel(hud_client_query_get_appstack_model(m_clientQuery));
+}

=== modified file 'plugins/HudClient/hudclient.h'
--- plugins/HudClient/hudclient.h	2013-02-12 10:40:50 +0000
+++ plugins/HudClient/hudclient.h	2013-04-26 08:09:29 +0000
@@ -57,6 +57,7 @@
 
     void modelReady(bool needDisconnect);
     void modelReallyReady(bool needDisconnect);
+    void queryModelsChanged();
 
   Q_SIGNALS:
     void voiceQueryLoading();