Merge lp:~michihenning/unity/fix-c-linkage-1163719 into lp:unity/phablet

[Michał Sawicz]

Fixes incorrect linkage for C++ function pointers passed to C API. See bug #1163719

Fixes incorrect linkage for C++ function pointers passed to C API. See bug #1163719

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/234/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/235/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/110/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/110/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Seems a huge diff for the small description it carries, maybe you forgot to make it depend in a pre-requisite branch?

[Michi Henning (michihenning)]

My apologies, that's my Launchpad ignorance at work. Will resubmit.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/244/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/245/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/244/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/120/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/120/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/245/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/246
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/246/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/608

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

The diff is still wrong

review: Needs Fixing

[Michał Sawicz (saviq)]

Resubmitting for LP to come to senses.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/302/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/303
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/685

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Personally, i do prefer the static functions over the anonymous namespace, but not that it really matters

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/HudClient/hudclient.cpp'
--- plugins/HudClient/hudclient.cpp	2013-02-14 16:39:59 +0000
+++ plugins/HudClient/hudclient.cpp	2013-04-05 20:40:26 +0000
@@ -20,41 +20,51 @@
 
 #include <QDebug>
 
-static void loadingCB(GObject* /*src*/, gpointer dst)
+namespace
+{
+
+extern "C"
+{
+
+void loadingCB(GObject* /*src*/, gpointer dst)
 {
     static_cast<HudClient*>(dst)->voiceQueryLoading();
 }
 
-static void listeningCB(GObject* /*src*/, gpointer dst)
+void listeningCB(GObject* /*src*/, gpointer dst)
 {
     static_cast<HudClient*>(dst)->voiceQueryListening();
 }
 
-static void heardSomethingCB(GObject* /*src*/, gpointer dst)
+void heardSomethingCB(GObject* /*src*/, gpointer dst)
 {
     static_cast<HudClient*>(dst)->voiceQueryHeardSomething();
 }
 
-static void failedCB(GObject* /*src*/, const gchar * /*reason*/, gpointer dst)
+void failedCB(GObject* /*src*/, const gchar * /*reason*/, gpointer dst)
 {
     static_cast<HudClient*>(dst)->voiceQueryFailed();
 }
 
-static void finishedCB(GObject* /*src*/, const gchar* query, gpointer dst)
+void finishedCB(GObject* /*src*/, const gchar* query, gpointer dst)
 {
     static_cast<HudClient*>(dst)->voiceQueryFinished(QString::fromUtf8(query));
 }
 
-static void modelReadyCB(GObject* /*src*/, gpointer dst)
+void modelReadyCB(GObject* /*src*/, gpointer dst)
 {
     static_cast<HudClient*>(dst)->modelReady(true);
 }
 
-static void modelReallyReadyCB(GObject* /*src*/, gint /*position*/, gint /*removed*/, gint /*added*/, gpointer dst)
+void modelReallyReadyCB(GObject* /*src*/, gint /*position*/, gint /*removed*/, gint /*added*/, gpointer dst)
 {
   static_cast<HudClient*>(dst)->modelReallyReady(true);
 }
 
+} // extern "C"
+
+} // namespace
+
 HudClient::HudClient()
 {
   m_results = new DeeListModel();