GitHub PullRequestReviewCommentEvent at 2014-06-13 08:55:23
Repository: libpalaso
Actor: ermshiperete
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/sillsdev/libpalaso/pulls/comments/13742651","id":13742651,"diff_hunk":"@@ -197,28 +198,35 @@ private void ProcessLanguage(IntPtr configRegistry, ref XklConfigItem item, IntP\n \t\t\t}\n \t\t}\n \n-\t\tprivate void ProcessOneLayoutForLanguage(IntPtr configRegistry, ref XklConfigItem item,\n-\t\t\tref XklConfigItem subitem, IntPtr data)\n+\t\tprivate void ProcessLayoutVariant(IntPtr configRegistry, ref XklConfigItem item, IntPtr data)\n \t\t{\n-\t\t\tvar subitemIsNull = subitem.Parent.RefCount == IntPtr.Zero;\n-\t\t\tXklConfigItem language = (XklConfigItem)Marshal.PtrToStructure(data, typeof(XklConfigItem));\n-\t\t\tvar description = subitemIsNull ? item.Description : subitem.Description;\n-\t\t\tList<LayoutDescription > layouts;\n+\t\t\tStoreLayoutInfo(item, data);\n+\t\t}\n+\n+\t\tvoid StoreLayoutInfo(XklConfigItem item, IntPtr data)\n+\t\t{\n+\t\t\tvar description = item.Description;\n+\t\t\tList<LayoutDescription> layouts;\n \t\t\tif (m_Layouts.ContainsKey(description))\n+\t\t\t{\n \t\t\t\tlayouts = m_Layouts[description];\n+\t\t\t}\n \t\t\telse\n \t\t\t{\n \t\t\t\tlayouts = new List<LayoutDescription>();\n \t\t\t\tm_Layouts[description] = layouts;\n \t\t\t}\n-\n \t\t\tvar newLayout = new LayoutDescription {\n-\t\t\t\tLayoutId = subitemIsNull ? item.Name : subitem.Name,\n+\t\t\t\tLayoutId = item.Name,\n \t\t\t\tDescription = description,\n-\t\t\t\tLayoutVariant = subitemIsNull ? string.Empty : subitem.Description,\n-\t\t\t\tLanguageCode = Get2LetterLanguageCode(language.Name),\n+\t\t\t\tLayoutVariant = String.Empty,\n \t\t\t\tCountryCode = item.Name.ToUpper()","path":"PalasoUIWindowsForms/Keyboarding/Linux/XklConfigRegistry.cs","position":66,"original_position":66,"commit_id":"39796b1154f7059a73a9a3ee891edb798a4ad93c","original_commit_id":"39796b1154f7059a73a9a3ee891edb798a4ad93c","user":{"login":"ermshiperete","id":181336,"avatar_url":"https://avatars.githubusercontent.com/u/181336?","gravatar_id":"56e93ba634a72e535bbc7ec6f78246a4","url":"https://api.github.com/users/ermshiperete","html_url":"https://github.com/ermshiperete","followers_url":"https://api.github.com/users/ermshiperete/followers","following_url":"https://api.github.com/users/ermshiperete/following{/other_user}","gists_url":"https://api.github.com/users/ermshiperete/gists{/gist_id}","starred_url":"https://api.github.com/users/ermshiperete/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ermshiperete/subscriptions","organizations_url":"https://api.github.com/users/ermshiperete/orgs","repos_url":"https://api.github.com/users/ermshiperete/repos","events_url":"https://api.github.com/users/ermshiperete/events{/privacy}","received_events_url":"https://api.github.com/users/ermshiperete/received_events","type":"User","site_admin":false},"body":"I know you didn't change this line, but I just noticed that it is wrong when processing the variants (e.g. we get DVORAK-L as value).","created_at":"2014-06-13T08:55:23Z","updated_at":"2014-06-13T08:55:23Z","html_url":"https://github.com/sillsdev/libpalaso/pull/53#discussion_r13742651","pull_request_url":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53","_links":{"self":{"href":"https://api.github.com/repos/sillsdev/libpalaso/pulls/comments/13742651"},"html":{"href":"https://github.com/sillsdev/libpalaso/pull/53#discussion_r13742651"},"pull_request":{"href":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53"}}},"pull_request":{"url":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53","id":17081687,"html_url":"https://github.com/sillsdev/libpalaso/pull/53","diff_url":"https://github.com/sillsdev/libpalaso/pull/53.diff","patch_url":"https://github.com/sillsdev/libpalaso/pull/53.patch","issue_url":"https://api.github.com/repos/sillsdev/libpalaso/issues/53","number":53,"state":"open","title":"Allow custom xkb keyboards to be displayed","user":{"login":"StephenMcConnel","id":2228246,"avatar_url":"https://avatars.githubusercontent.com/u/2228246?","gravatar_id":"a0894206c14d35e02d3c2d35441509ae","url":"https://api.github.com/users/StephenMcConnel","html_url":"https://github.com/StephenMcConnel","followers_url":"https://api.github.com/users/StephenMcConnel/followers","following_url":"https://api.github.com/users/StephenMcConnel/following{/other_user}","gists_url":"https://api.github.com/users/StephenMcConnel/gists{/gist_id}","starred_url":"https://api.github.com/users/StephenMcConnel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/StephenMcConnel/subscriptions","organizations_url":"https://api.github.com/users/StephenMcConnel/orgs","repos_url":"https://api.github.com/users/StephenMcConnel/repos","events_url":"https://api.github.com/users/StephenMcConnel/events{/privacy}","received_events_url":"https://api.github.com/users/StephenMcConnel/received_events","type":"User","site_admin":false},"body":"Advanced users can define custom Xkb keyboard layouts for otherwise\r\nunsupported languages/scripts.  Without this change, only the standard\r\nsystem keyboards could be seen in our programs even though the system\r\ncould choose the custom keyboards through its standard setup software\r\nand input language applets.","created_at":"2014-06-12T21:42:02Z","updated_at":"2014-06-13T08:55:23Z","closed_at":null,"merged_at":null,"merge_commit_sha":"88178250063ddd9c25efd021fedaf7d1cf5d2656","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53/commits","review_comments_url":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53/comments","review_comment_url":"https://api.github.com/repos/sillsdev/libpalaso/pulls/comments/{number}","comments_url":"https://api.github.com/repos/sillsdev/libpalaso/issues/53/comments","statuses_url":"https://api.github.com/repos/sillsdev/libpalaso/statuses/39796b1154f7059a73a9a3ee891edb798a4ad93c","head":{"label":"sillsdev:FixForCustomXkbKeyboards","ref":"FixForCustomXkbKeyboards","sha":"39796b1154f7059a73a9a3ee891edb798a4ad93c","user":{"login":"sillsdev","id":1095739,"avatar_url":"https://avatars.githubusercontent.com/u/1095739?","gravatar_id":"1ea78f4cffbbae7970a9a76cf5b40922","url":"https://api.github.com/users/sillsdev","html_url":"https://github.com/sillsdev","followers_url":"https://api.github.com/users/sillsdev/followers","following_url":"https://api.github.com/users/sillsdev/following{/other_user}","gists_url":"https://api.github.com/users/sillsdev/gists{/gist_id}","starred_url":"https://api.github.com/users/sillsdev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sillsdev/subscriptions","organizations_url":"https://api.github.com/users/sillsdev/orgs","repos_url":"https://api.github.com/users/sillsdev/repos","events_url":"https://api.github.com/users/sillsdev/events{/privacy}","received_events_url":"https://api.github.com/users/sillsdev/received_events","type":"Organization","site_admin":false},"repo":{"id":15614464,"name":"libpalaso","full_name":"sillsdev/libpalaso","owner":{"login":"sillsdev","id":1095739,"avatar_url":"https://avatars.githubusercontent.com/u/1095739?","gravatar_id":"1ea78f4cffbbae7970a9a76cf5b40922","url":"https://api.github.com/users/sillsdev","html_url":"https://github.com/sillsdev","followers_url":"https://api.github.com/users/sillsdev/followers","following_url":"https://api.github.com/users/sillsdev/following{/other_user}","gists_url":"https://api.github.com/users/sillsdev/gists{/gist_id}","starred_url":"https://api.github.com/users/sillsdev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sillsdev/subscriptions","organizations_url":"https://api.github.com/users/sillsdev/orgs","repos_url":"https://api.github.com/users/sillsdev/repos","events_url":"https://api.github.com/users/sillsdev/events{/privacy}","received_events_url":"https://api.github.com/users/sillsdev/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/sillsdev/libpalaso","description":"Palaso Library: A set of .Net libraries useful for developers of Language Software.","fork":false,"url":"https://api.github.com/repos/sillsdev/libpalaso","forks_url":"https://api.github.com/repos/sillsdev/libpalaso/forks","keys_url":"https://api.github.com/repos/sillsdev/libpalaso/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sillsdev/libpalaso/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sillsdev/libpalaso/teams","hooks_url":"https://api.github.com/repos/sillsdev/libpalaso/hooks","issue_events_url":"https://api.github.com/repos/sillsdev/libpalaso/issues/events{/number}","events_url":"https://api.github.com/repos/sillsdev/libpalaso/events","assignees_url":"https://api.github.com/repos/sillsdev/libpalaso/assignees{/user}","branches_url":"https://api.github.com/repos/sillsdev/libpalaso/branches{/branch}","tags_url":"https://api.github.com/repos/sillsdev/libpalaso/tags","blobs_url":"https://api.github.com/repos/sillsdev/libpalaso/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sillsdev/libpalaso/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sillsdev/libpalaso/git/refs{/sha}","trees_url":"https://api.github.com/repos/sillsdev/libpalaso/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sillsdev/libpalaso/statuses/{sha}","languages_url":"https://api.github.com/repos/sillsdev/libpalaso/languages","stargazers_url":"https://api.github.com/repos/sillsdev/libpalaso/stargazers","contributors_url":"https://api.github.com/repos/sillsdev/libpalaso/contributors","subscribers_url":"https://api.github.com/repos/sillsdev/libpalaso/subscribers","subscription_url":"https://api.github.com/repos/sillsdev/libpalaso/subscription","commits_url":"https://api.github.com/repos/sillsdev/libpalaso/commits{/sha}","git_commits_url":"https://api.github.com/repos/sillsdev/libpalaso/git/commits{/sha}","comments_url":"https://api.github.com/repos/sillsdev/libpalaso/comments{/number}","issue_comment_url":"https://api.github.com/repos/sillsdev/libpalaso/issues/comments/{number}","contents_url":"https://api.github.com/repos/sillsdev/libpalaso/contents/{+path}","compare_url":"https://api.github.com/repos/sillsdev/libpalaso/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sillsdev/libpalaso/merges","archive_url":"https://api.github.com/repos/sillsdev/libpalaso/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sillsdev/libpalaso/downloads","issues_url":"https://api.github.com/repos/sillsdev/libpalaso/issues{/number}","pulls_url":"https://api.github.com/repos/sillsdev/libpalaso/pulls{/number}","milestones_url":"https://api.github.com/repos/sillsdev/libpalaso/milestones{/number}","notifications_url":"https://api.github.com/repos/sillsdev/libpalaso/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sillsdev/libpalaso/labels{/name}","releases_url":"https://api.github.com/repos/sillsdev/libpalaso/releases{/id}","created_at":"2014-01-03T16:57:39Z","updated_at":"2014-06-13T08:23:55Z","pushed_at":"2014-06-13T08:23:54Z","git_url":"git://github.com/sillsdev/libpalaso.git","ssh_url":"git@github.com:sillsdev/libpalaso.git","clone_url":"https://github.com/sillsdev/libpalaso.git","svn_url":"https://github.com/sillsdev/libpalaso","homepage":"","size":21035,"stargazers_count":0,"watchers_count":0,"language":"C#","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":4,"mirror_url":null,"open_issues_count":3,"forks":4,"open_issues":3,"watchers":0,"default_branch":"master"}},"base":{"label":"sillsdev:master","ref":"master","sha":"d40de82fc7f2ba9d4f86da3bf7e47df21badf60a","user":{"login":"sillsdev","id":1095739,"avatar_url":"https://avatars.githubusercontent.com/u/1095739?","gravatar_id":"1ea78f4cffbbae7970a9a76cf5b40922","url":"https://api.github.com/users/sillsdev","html_url":"https://github.com/sillsdev","followers_url":"https://api.github.com/users/sillsdev/followers","following_url":"https://api.github.com/users/sillsdev/following{/other_user}","gists_url":"https://api.github.com/users/sillsdev/gists{/gist_id}","starred_url":"https://api.github.com/users/sillsdev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sillsdev/subscriptions","organizations_url":"https://api.github.com/users/sillsdev/orgs","repos_url":"https://api.github.com/users/sillsdev/repos","events_url":"https://api.github.com/users/sillsdev/events{/privacy}","received_events_url":"https://api.github.com/users/sillsdev/received_events","type":"Organization","site_admin":false},"repo":{"id":15614464,"name":"libpalaso","full_name":"sillsdev/libpalaso","owner":{"login":"sillsdev","id":1095739,"avatar_url":"https://avatars.githubusercontent.com/u/1095739?","gravatar_id":"1ea78f4cffbbae7970a9a76cf5b40922","url":"https://api.github.com/users/sillsdev","html_url":"https://github.com/sillsdev","followers_url":"https://api.github.com/users/sillsdev/followers","following_url":"https://api.github.com/users/sillsdev/following{/other_user}","gists_url":"https://api.github.com/users/sillsdev/gists{/gist_id}","starred_url":"https://api.github.com/users/sillsdev/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sillsdev/subscriptions","organizations_url":"https://api.github.com/users/sillsdev/orgs","repos_url":"https://api.github.com/users/sillsdev/repos","events_url":"https://api.github.com/users/sillsdev/events{/privacy}","received_events_url":"https://api.github.com/users/sillsdev/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/sillsdev/libpalaso","description":"Palaso Library: A set of .Net libraries useful for developers of Language Software.","fork":false,"url":"https://api.github.com/repos/sillsdev/libpalaso","forks_url":"https://api.github.com/repos/sillsdev/libpalaso/forks","keys_url":"https://api.github.com/repos/sillsdev/libpalaso/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sillsdev/libpalaso/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sillsdev/libpalaso/teams","hooks_url":"https://api.github.com/repos/sillsdev/libpalaso/hooks","issue_events_url":"https://api.github.com/repos/sillsdev/libpalaso/issues/events{/number}","events_url":"https://api.github.com/repos/sillsdev/libpalaso/events","assignees_url":"https://api.github.com/repos/sillsdev/libpalaso/assignees{/user}","branches_url":"https://api.github.com/repos/sillsdev/libpalaso/branches{/branch}","tags_url":"https://api.github.com/repos/sillsdev/libpalaso/tags","blobs_url":"https://api.github.com/repos/sillsdev/libpalaso/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sillsdev/libpalaso/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sillsdev/libpalaso/git/refs{/sha}","trees_url":"https://api.github.com/repos/sillsdev/libpalaso/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sillsdev/libpalaso/statuses/{sha}","languages_url":"https://api.github.com/repos/sillsdev/libpalaso/languages","stargazers_url":"https://api.github.com/repos/sillsdev/libpalaso/stargazers","contributors_url":"https://api.github.com/repos/sillsdev/libpalaso/contributors","subscribers_url":"https://api.github.com/repos/sillsdev/libpalaso/subscribers","subscription_url":"https://api.github.com/repos/sillsdev/libpalaso/subscription","commits_url":"https://api.github.com/repos/sillsdev/libpalaso/commits{/sha}","git_commits_url":"https://api.github.com/repos/sillsdev/libpalaso/git/commits{/sha}","comments_url":"https://api.github.com/repos/sillsdev/libpalaso/comments{/number}","issue_comment_url":"https://api.github.com/repos/sillsdev/libpalaso/issues/comments/{number}","contents_url":"https://api.github.com/repos/sillsdev/libpalaso/contents/{+path}","compare_url":"https://api.github.com/repos/sillsdev/libpalaso/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sillsdev/libpalaso/merges","archive_url":"https://api.github.com/repos/sillsdev/libpalaso/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sillsdev/libpalaso/downloads","issues_url":"https://api.github.com/repos/sillsdev/libpalaso/issues{/number}","pulls_url":"https://api.github.com/repos/sillsdev/libpalaso/pulls{/number}","milestones_url":"https://api.github.com/repos/sillsdev/libpalaso/milestones{/number}","notifications_url":"https://api.github.com/repos/sillsdev/libpalaso/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sillsdev/libpalaso/labels{/name}","releases_url":"https://api.github.com/repos/sillsdev/libpalaso/releases{/id}","created_at":"2014-01-03T16:57:39Z","updated_at":"2014-06-13T08:23:55Z","pushed_at":"2014-06-13T08:23:54Z","git_url":"git://github.com/sillsdev/libpalaso.git","ssh_url":"git@github.com:sillsdev/libpalaso.git","clone_url":"https://github.com/sillsdev/libpalaso.git","svn_url":"https://github.com/sillsdev/libpalaso","homepage":"","size":21035,"stargazers_count":0,"watchers_count":0,"language":"C#","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":4,"mirror_url":null,"open_issues_count":3,"forks":4,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53"},"html":{"href":"https://github.com/sillsdev/libpalaso/pull/53"},"issue":{"href":"https://api.github.com/repos/sillsdev/libpalaso/issues/53"},"comments":{"href":"https://api.github.com/repos/sillsdev/libpalaso/issues/53/comments"},"review_comments":{"href":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53/comments"},"review_comment":{"href":"https://api.github.com/repos/sillsdev/libpalaso/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/sillsdev/libpalaso/pulls/53/commits"},"statuses":{"href":"https://api.github.com/repos/sillsdev/libpalaso/statuses/39796b1154f7059a73a9a3ee891edb798a4ad93c"}}}}