From c0df13ed7a1636bca5507d0a51e872505df9410a Mon Sep 17 00:00:00 2001 From: Ranganath Atreya Date: Tue, 27 Jun 2017 15:56:24 +0530 Subject: [PATCH] Fix for candidate selection with input string --- EngineFramework/Tests/Info.plist | 4 ++-- InputSource/Resources/Info.plist | 4 ++-- InputSource/Sources/Application/DJLipikaClientManager.m | 2 +- InputSource/Tests/Info.plist | 4 ++-- LipikaIME.xcodeproj/project.pbxproj | 8 -------- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/EngineFramework/Tests/Info.plist b/EngineFramework/Tests/Info.plist index f230ca3..c8bb8a9 100644 --- a/EngineFramework/Tests/Info.plist +++ b/EngineFramework/Tests/Info.plist @@ -13,10 +13,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.5.0 + 1.7.3 CFBundleSignature DJLI CFBundleVersion - 2.2 + 1.0 diff --git a/InputSource/Resources/Info.plist b/InputSource/Resources/Info.plist index c1ae332..1758483 100644 --- a/InputSource/Resources/Info.plist +++ b/InputSource/Resources/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.0 + 1.7.3 CFBundleSignature DJLI CFBundleVersion - 2.2 + 1.0 InputMethodConnectionName DJLipikaInputController_Connection InputMethodServerControllerClass diff --git a/InputSource/Sources/Application/DJLipikaClientManager.m b/InputSource/Sources/Application/DJLipikaClientManager.m index 29ae78d..e3b7ef9 100644 --- a/InputSource/Sources/Application/DJLipikaClientManager.m +++ b/InputSource/Sources/Application/DJLipikaClientManager.m @@ -155,7 +155,7 @@ -(void)onEndSession { } -(void)onCandidateSelected:(NSString *)candidateString { - [client replaceTextAtCurrentSelection:candidateString]; + [client replaceTextAtCurrentSelection:[bufferManager output]]; [bufferManager flush]; [candidateManager hide]; } diff --git a/InputSource/Tests/Info.plist b/InputSource/Tests/Info.plist index f230ca3..c8bb8a9 100644 --- a/InputSource/Tests/Info.plist +++ b/InputSource/Tests/Info.plist @@ -13,10 +13,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.5.0 + 1.7.3 CFBundleSignature DJLI CFBundleVersion - 2.2 + 1.0 diff --git a/LipikaIME.xcodeproj/project.pbxproj b/LipikaIME.xcodeproj/project.pbxproj index c55b077..f912ad0 100644 --- a/LipikaIME.xcodeproj/project.pbxproj +++ b/LipikaIME.xcodeproj/project.pbxproj @@ -1443,7 +1443,6 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.2; DEVELOPMENT_TEAM = 7JZ87Y4JWT; FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1469,7 +1468,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -1492,7 +1490,6 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 2.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 7JZ87Y4JWT; ENABLE_NS_ASSERTIONS = NO; @@ -1513,7 +1510,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = framework; }; name = Release; @@ -1708,7 +1704,6 @@ CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 2.2; DEVELOPMENT_TEAM = 7JZ87Y4JWT; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1725,7 +1720,6 @@ SWIFT_OBJC_BRIDGING_HEADER = "InputSource-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; - VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -1738,7 +1732,6 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 2.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 7JZ87Y4JWT; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -1753,7 +1746,6 @@ SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = "InputSource-Bridging-Header.h"; SWIFT_VERSION = 3.0; - VERSIONING_SYSTEM = "apple-generic"; WRAPPER_EXTENSION = app; }; name = Release;