Update scim_helper.h and scim_panel_client.h for ABI issue

Change-Id: Ia70150b73e601940aefd1d524211f15ea80fec2a

diff --git a/debian/changelog b/debian/changelog
index d29519361e7ad1e866ef2f578ad8c8a2c153db39..46ebebd2c847ece5dab2795b046bb2234785d236 100755 (executable)
--- 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 <haifeng.deng@samsung.com>  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 c90546902e00c6027dafab82521ad48f4df1c6d0..283192c58a05c47135361809b6a536b58a3dec23 100644 (file)
--- 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<uint32> &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<uint32> &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 12392afdd242d7d1200c683c3d595336417b7763..41487a06e7458d6d956721c2055fdac5b81fb089 100644 (file)
--- 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<uint32> &);
-     */
-    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<uint32> &);
+     */
+    Connection signal_connect_update_candidate_item_layout (PanelClientSlotUintVector               *slot);
+
     /** @} */
 };
 

diff --git a/packaging/isf.spec b/packaging/isf.spec
index be4c2e970efb8abd0c829cd793e6563393f22a81..6f40f41120b0c4eb7c804b1ddf5bbce433e66253 100755 (executable)
--- 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