From 7335626728debfa2abe7be43f9ecdca80db00e08 Mon Sep 17 00:00:00 2001 From: Haifeng Deng Date: Fri, 23 Nov 2012 17:05:28 +0800 Subject: [PATCH] Update scim_helper.h and scim_panel_client.h for ABI issue Change-Id: Ia70150b73e601940aefd1d524211f15ea80fec2a --- debian/changelog | 8 ++++++++ ism/src/scim_helper.h | 16 ++++++++-------- ism/src/scim_panel_client.h | 14 +++++++------- packaging/isf.spec | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2951936..46ebebd2 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +isf (2.3.5923-1slp2+2) unstable; urgency=low + + * Update scim_helper.h for ABI issue + * Git: framework/uifw/isf + * Tag: isf_2.3.5923-1slp2+2 + + -- Haifeng Deng Fri, 23 Nov 2012 18:02:00 +0900 + isf (2.3.5923-1slp2+1) unstable; urgency=low * Add expand_candidate (), contract_candidate () and update_candidate_item_layout () for keyboard ISE diff --git a/ism/src/scim_helper.h b/ism/src/scim_helper.h index c9054690..283192c5 100644 --- a/ism/src/scim_helper.h +++ b/ism/src/scim_helper.h @@ -969,14 +969,6 @@ public: */ Connection signal_connect_update_candidate_table_page_size (HelperAgentSlotInt *slot); - /** - * @brief Connect a slot to Helper update candidate item layout signal. - * - * The prototype of the slot is: - * void update_candidate_item_layout (const HelperAgent *, const std::vector &row_items); - */ - Connection signal_connect_update_candidate_item_layout (HelperAgentSlotUintVector *slot); - /** * @brief Connect a slot to Helper select associate signal. * @@ -1046,6 +1038,14 @@ public: * void longpress_candidate (const HelperAgent *agent, int ic, const String &uuid, int index); */ Connection signal_connect_longpress_candidate (HelperAgentSlotInt *slot); + + /** + * @brief Connect a slot to Helper update candidate item layout signal. + * + * The prototype of the slot is: + * void update_candidate_item_layout (const HelperAgent *, const std::vector &row_items); + */ + Connection signal_connect_update_candidate_item_layout (HelperAgentSlotUintVector *slot); }; /** @} */ diff --git a/ism/src/scim_panel_client.h b/ism/src/scim_panel_client.h index 12392afd..41487a06 100644 --- a/ism/src/scim_panel_client.h +++ b/ism/src/scim_panel_client.h @@ -238,13 +238,6 @@ public: */ Connection signal_connect_exit (PanelClientSlotVoid *slot); - /** - * @brief Signal: update candidate item layout - * - * slot prototype: void update_candidate_item_layout (int context, const std::vector &); - */ - Connection signal_connect_update_candidate_item_layout (PanelClientSlotUintVector *slot); - /** * @brief Signal: update lookup table page size * @@ -410,6 +403,13 @@ public: */ Connection signal_connect_delete_surrounding_text (PanelClientSlotIntInt *slot); + /** + * @brief Signal: update candidate item layout + * + * slot prototype: void update_candidate_item_layout (int context, const std::vector &); + */ + Connection signal_connect_update_candidate_item_layout (PanelClientSlotUintVector *slot); + /** @} */ }; diff --git a/packaging/isf.spec b/packaging/isf.spec index be4c2e97..6f40f411 100755 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -5,7 +5,7 @@ Name: isf Summary: Input Service Framework Version: 2.3.5923 -Release: 1 +Release: 2 Group: TO_BE/FILLED_IN License: LGPL Source0: %{name}-%{version}.tar.gz -- 2.34.1