Fix for candidate selection with input string

ratreya · Jun 27, 2017 · c0df13e · c0df13e
1 parent 55aa086
commit c0df13e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/EngineFramework/Tests/Info.plist b/EngineFramework/Tests/Info.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.7.3</string>
 	<key>CFBundleSignature</key>
 	<string>DJLI</string>
 	<key>CFBundleVersion</key>
-	<string>2.2</string>
+	<string>1.0</string>
 </dict>
 </plist>
diff --git a/InputSource/Resources/Info.plist b/InputSource/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.7.3</string>
 	<key>CFBundleSignature</key>
 	<string>DJLI</string>
 	<key>CFBundleVersion</key>
-	<string>2.2</string>
+	<string>1.0</string>
 	<key>InputMethodConnectionName</key>
 	<string>DJLipikaInputController_Connection</string>
 	<key>InputMethodServerControllerClass</key>

diff --git 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
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.7.3</string>
 	<key>CFBundleSignature</key>
 	<string>DJLI</string>
 	<key>CFBundleVersion</key>
-	<string>2.2</string>
+	<string>1.0</string>
 </dict>
 </plist>
diff --git 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;