Merge lp:~xnox/ubuntu-keyboard/libpinyin4 into lp:ubuntu-keyboard

[Dimitri John Ledkov]

Port to libpinyin4-dev API. (LP: #1247840)

Port to libpinyin4-dev API. (LP: #1247840)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/32/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/204/rebuild

review: Needs Fixing (continuous-integration)

[lp:~xnox/ubuntu-keyboard/libpinyin4]

98. By Dimitri John Ledkov on 2013-11-04

Port to libpinyin4-dev API. (LP: #1247840)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/209/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/37/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/209/rebuild

review: Needs Fixing (continuous-integration)

[lp:~xnox/ubuntu-keyboard/libpinyin4]

99. By Dimitri John Ledkov on 2013-11-04

merge trunk

[Dimitri John Ledkov (xnox)]

99 trunk merges borked lp:ubuntu-keyboard

- depends on gdb, yet gdb build-dep is not declared
- depends on running dbus, which is not available in sbuild/chroot.

[Dimitri John Ledkov (xnox)]

Also reported https://bugs.launchpad.net/ubuntu-ci-services-itself/+bug/1247992 the upstream merger is build this package with trusty-proposed enabled.

[lp:~xnox/ubuntu-keyboard/libpinyin4]

100. By Dimitri John Ledkov on 2013-11-05

Merge trunk

101. By Dimitri John Ledkov on 2013-11-12

Merge from trunk

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-25 11:04:48 +0000
+++ debian/changelog	2013-11-04 23:21:25 +0000
@@ -1,3 +1,9 @@
+ubuntu-keyboard (0.99.trunk.phablet2+14.04.20131025-0ubuntu2) UNRELEASED; urgency=low
+
+  * Port to libpinyin4-dev API. (LP: #1247840)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 04 Nov 2013 23:14:10 +0000
+
 ubuntu-keyboard (0.99.trunk.phablet2+14.04.20131025-0ubuntu1) trusty; urgency=low
 
   [ Daniel d'Andrada ]

=== modified file 'debian/control'
--- debian/control	2013-11-04 17:48:55 +0000
+++ debian/control	2013-11-04 23:21:25 +0000
@@ -10,7 +10,7 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                libhunspell-dev,
-               libpinyin2-dev,
+               libpinyin4-dev,
                libplatform-api1-dev,
                libpresage-dev,
                libxml2-utils,

=== modified file 'src/lib/logic/pinyinadapter.cpp'
--- src/lib/logic/pinyinadapter.cpp	2013-08-19 20:44:22 +0000
+++ src/lib/logic/pinyinadapter.cpp	2013-11-04 23:21:25 +0000
@@ -57,8 +57,8 @@
     std::cout << std::endl;
 #endif
 
-    m_array = g_array_new(FALSE, FALSE, sizeof(lookup_candidate_t));
-    pinyin_get_candidates(m_instance, 0, m_array);
+
+    pinyin_guess_candidates(m_instance, 0);
 
     pinyin_guess_sentence(m_instance);
 
@@ -66,16 +66,20 @@
     pinyin_get_sentence(m_instance, &sentence);
 
     candidates.clear();
-    for (unsigned int i = 0 ; i < m_array->len; i ++ )
+    guint len = 0;
+    pinyin_get_n_candidate(m_instance, &len);
+    for (unsigned int i = 0 ; i < len; i ++ )
     {
-        lookup_candidate_t token = g_array_index(m_array, lookup_candidate_t, i);
-        char* word = NULL;
+        lookup_candidate_t * candidate = NULL;
+	pinyin_get_candidate(m_instance, i, &candidate);
+
+        const char* word = NULL;
+	pinyin_get_candidate_string(m_instance, candidate, &word);
+
         // Translate the token to utf-8 phrase.
-        pinyin_translate_token(m_instance, token.m_token, &word);
         if (word) {
             candidates.append(QString(word));
         }
-        g_free(word);
     }
 
     QString unicode(sentence);
@@ -91,7 +95,10 @@
 void PinyinAdapter::wordCandidateSelected(const QString& word)
 {
     Q_UNUSED(word)
-    pinyin_choose_candidate(m_instance, 0, &g_array_index(m_array, lookup_candidate_t, 1));
+
+    lookup_candidate_t * candidate = NULL;
+    pinyin_get_candidate(m_instance, 1, &candidate);
+    pinyin_choose_candidate(m_instance, 0, candidate);
 }
 
 void PinyinAdapter::reset()