From 0ce28c0b0d87cb199ef790a9acc1ba25e64e2e84 Mon Sep 17 00:00:00 2001 From: linkmauve Date: Wed, 10 Jan 2018 15:12:54 +0100 Subject: Fix typos in comments and variable names (#269) Thanks `codespell`! --- libdino/src/entity/file_transfer.vala | 2 +- libdino/src/entity/message.vala | 2 +- libdino/src/service/entity_capabilities_storage.vala | 4 ++-- main/src/ui/conversation_summary/default_file_display.vala | 2 +- main/src/ui/conversation_summary/image_display.vala | 2 +- main/src/ui/conversation_summary/message_textview.vala | 2 +- plugins/signal-protocol/tests/common.vala | 4 ++-- xmpp-vala/src/core/stanza_node.vala | 2 +- xmpp-vala/src/module/xep/0030_service_discovery/flag.vala | 2 +- xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala | 4 ++-- xmpp-vala/tests/common.vala | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libdino/src/entity/file_transfer.vala b/libdino/src/entity/file_transfer.vala index e26b723c..120d3b38 100644 --- a/libdino/src/entity/file_transfer.vala +++ b/libdino/src/entity/file_transfer.vala @@ -44,7 +44,7 @@ public class FileTransfer : Object { this.db = db; id = row[db.file_transfer.id]; - account = db.get_account_by_id(row[db.file_transfer.account_id]); // TODO dont have to generate acc new + account = db.get_account_by_id(row[db.file_transfer.account_id]); // TODO don’t have to generate acc new string counterpart_jid = db.get_jid_by_id(row[db.file_transfer.counterpart_id]); string counterpart_resource = row[db.file_transfer.counterpart_resource]; diff --git a/libdino/src/entity/message.vala b/libdino/src/entity/message.vala index 5574ed40..27bd08d8 100644 --- a/libdino/src/entity/message.vala +++ b/libdino/src/entity/message.vala @@ -63,7 +63,7 @@ public class Message : Object { this.db = db; id = row[db.message.id]; - account = db.get_account_by_id(row[db.message.account_id]); // TODO dont have to generate acc new + account = db.get_account_by_id(row[db.message.account_id]); // TODO don’t have to generate acc new stanza_id = row[db.message.stanza_id]; type_ = (Message.Type) row[db.message.type_]; diff --git a/libdino/src/service/entity_capabilities_storage.vala b/libdino/src/service/entity_capabilities_storage.vala index 910ce48d..94d9d88e 100644 --- a/libdino/src/service/entity_capabilities_storage.vala +++ b/libdino/src/service/entity_capabilities_storage.vala @@ -16,8 +16,8 @@ public class EntityCapabilitiesStorage : Xep.EntityCapabilities.Storage, Object db.add_entity_features(entity, features); } - public Gee.List get_features(string entitiy) { - return db.get_entity_features(entitiy); + public Gee.List get_features(string entity) { + return db.get_entity_features(entity); } } } diff --git a/main/src/ui/conversation_summary/default_file_display.vala b/main/src/ui/conversation_summary/default_file_display.vala index c919b1dd..42fe2214 100644 --- a/main/src/ui/conversation_summary/default_file_display.vala +++ b/main/src/ui/conversation_summary/default_file_display.vala @@ -67,7 +67,7 @@ public class DefaultFileDisplay : Plugins.MetaConversationItem { try{ AppInfo.launch_default_for_uri("file://" + file_transfer.get_uri(), null); } catch (Error err) { - print("Tryed to open " + file_transfer.get_uri()); + print("Tried to open " + file_transfer.get_uri()); } } return false; diff --git a/main/src/ui/conversation_summary/image_display.vala b/main/src/ui/conversation_summary/image_display.vala index 3f1b0bd6..6093f759 100644 --- a/main/src/ui/conversation_summary/image_display.vala +++ b/main/src/ui/conversation_summary/image_display.vala @@ -83,7 +83,7 @@ public class ImageDisplay : Plugins.MetaConversationItem { try{ AppInfo.launch_default_for_uri(file_transfer.info, null); } catch (Error err) { - print("Tryed to open " + file_transfer.info); + print("Tried to open " + file_transfer.info); } }); diff --git a/main/src/ui/conversation_summary/message_textview.vala b/main/src/ui/conversation_summary/message_textview.vala index 1175d3ad..9fe3b60b 100644 --- a/main/src/ui/conversation_summary/message_textview.vala +++ b/main/src/ui/conversation_summary/message_textview.vala @@ -117,7 +117,7 @@ public class MessageTextView : TextView { try{ AppInfo.launch_default_for_uri(url, null); } catch (Error err) { - print("Tryed to open " + url); + print("Tried to open " + url); } } return false; diff --git a/plugins/signal-protocol/tests/common.vala b/plugins/signal-protocol/tests/common.vala index 4fd463c0..26e90185 100644 --- a/plugins/signal-protocol/tests/common.vala +++ b/plugins/signal-protocol/tests/common.vala @@ -52,7 +52,7 @@ void fail_if_not_error_code(ErrorFunc func, int expectedCode, string? reason = n func(); fail_if_reached(@"$(reason + ": " ?? "")no error thrown"); } catch (Error e) { - fail_if_not_eq_int(e.code, expectedCode, @"$(reason + ": " ?? "")catched unexpected error"); + fail_if_not_eq_int(e.code, expectedCode, @"$(reason + ": " ?? "")caught unexpected error"); } } @@ -89,4 +89,4 @@ bool fail_if_null(void* what, string? reason = null) { return fail_if(what == null || (size_t)what == 0, reason); } -} \ No newline at end of file +} diff --git a/xmpp-vala/src/core/stanza_node.vala b/xmpp-vala/src/core/stanza_node.vala index 341e67ba..695a72cd 100644 --- a/xmpp-vala/src/core/stanza_node.vala +++ b/xmpp-vala/src/core/stanza_node.vala @@ -282,7 +282,7 @@ public class StanzaNode : StanzaEntry { } /** - * Set only occurence + * Set only occurrence **/ public void set_attribute(string name, string val, string? ns_uri = null) { if (ns_uri == null) ns_uri = this.ns_uri; diff --git a/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala b/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala index cd847974..4f3e5eea 100644 --- a/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala +++ b/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala @@ -13,7 +13,7 @@ public class Flag : XmppStreamFlag { public Gee.List features = new ArrayList(); public Gee.List? get_entity_categories(string jid) { - return entity_identities.has_key(jid) ? entity_identities[jid] : null; // TODO isnt this default for hashmap + return entity_identities.has_key(jid) ? entity_identities[jid] : null; // TODO isn’t this default for hashmap } public bool? has_entity_identity(string jid, string category, string type) { diff --git a/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala b/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala index 9f57a14b..cba58883 100644 --- a/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala +++ b/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala @@ -103,7 +103,7 @@ namespace Xmpp.Xep.EntityCapabilities { } public interface Storage : Object { - public abstract void store_features(string entitiy, Gee.List capabilities); - public abstract Gee.List get_features(string entitiy); + public abstract void store_features(string entity, Gee.List capabilities); + public abstract Gee.List get_features(string entity); } } diff --git a/xmpp-vala/tests/common.vala b/xmpp-vala/tests/common.vala index b393ba79..e1c155ac 100644 --- a/xmpp-vala/tests/common.vala +++ b/xmpp-vala/tests/common.vala @@ -27,7 +27,7 @@ void fail_if_not_error_code(ErrorFunc func, int expectedCode, string? reason = n func(); fail_if_reached(@"$(reason + ": " ?? "")no error thrown"); } catch (Error e) { - fail_if_not_eq_int(e.code, expectedCode, @"$(reason + ": " ?? "")catched unexpected error"); + fail_if_not_eq_int(e.code, expectedCode, @"$(reason + ": " ?? "")caught unexpected error"); } } -- cgit v1.2.3-70-g09d2