parent
5557c03be8
commit
0ce28c0b0d
|
@ -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];
|
||||
|
|
|
@ -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_];
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@ public class EntityCapabilitiesStorage : Xep.EntityCapabilities.Storage, Object
|
|||
db.add_entity_features(entity, features);
|
||||
}
|
||||
|
||||
public Gee.List<string> get_features(string entitiy) {
|
||||
return db.get_entity_features(entitiy);
|
||||
public Gee.List<string> get_features(string entity) {
|
||||
return db.get_entity_features(entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -13,7 +13,7 @@ public class Flag : XmppStreamFlag {
|
|||
public Gee.List<string> features = new ArrayList<string>();
|
||||
|
||||
public Gee.List<Identity>? 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) {
|
||||
|
|
|
@ -103,7 +103,7 @@ namespace Xmpp.Xep.EntityCapabilities {
|
|||
}
|
||||
|
||||
public interface Storage : Object {
|
||||
public abstract void store_features(string entitiy, Gee.List<string> capabilities);
|
||||
public abstract Gee.List<string> get_features(string entitiy);
|
||||
public abstract void store_features(string entity, Gee.List<string> capabilities);
|
||||
public abstract Gee.List<string> get_features(string entity);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue