diff options
| -rw-r--r-- | libdino/src/plugin/interfaces.vala | 14 | ||||
| -rw-r--r-- | libdino/src/service/history_sync.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/roster_manager.vala | 2 | ||||
| -rw-r--r-- | plugins/omemo/src/protocol/bundle.vala | 4 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0166_jingle/content.vala | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/libdino/src/plugin/interfaces.vala b/libdino/src/plugin/interfaces.vala index eb3960fd..86d82bc2 100644 --- a/libdino/src/plugin/interfaces.vala +++ b/libdino/src/plugin/interfaces.vala @@ -48,7 +48,7 @@ public abstract class AccountSettingsEntry : Object { public abstract string name { get; } public virtual int16 label_top_padding { get { return -1; } } - public abstract signal void activated(); + public signal void activated(); public abstract void deactivate(); public abstract void set_account(Account account); @@ -90,17 +90,17 @@ public interface ConversationTitlebarEntry : Object { public abstract void unset_conversation(); } -public abstract interface ConversationItemPopulator : Object { +public interface ConversationItemPopulator : Object { public abstract string id { get; } public abstract void init(Conversation conversation, ConversationItemCollection summary, WidgetType type); public abstract void close(Conversation conversation); } -public abstract interface ConversationAdditionPopulator : ConversationItemPopulator { +public interface ConversationAdditionPopulator : ConversationItemPopulator { public virtual void populate_timespan(Conversation conversation, DateTime from, DateTime to) { } } -public abstract interface VideoCallPlugin : Object { +public interface VideoCallPlugin : Object { public abstract bool supported(); // Video widget @@ -117,14 +117,14 @@ public abstract interface VideoCallPlugin : Object { public abstract void dump_dot(); } -public abstract interface VideoCallWidget : Object { +public interface VideoCallWidget : Object { public signal void resolution_changed(uint width, uint height); public abstract void display_stream(Xmpp.Xep.JingleRtp.Stream? stream, Jid jid); public abstract void display_device(MediaDevice device); public abstract void detach(); } -public abstract interface MediaDevice : Object { +public interface MediaDevice : Object { public abstract string id { owned get; } public abstract string display_name { owned get; } public abstract string? detail_name { owned get; } @@ -133,7 +133,7 @@ public abstract interface MediaDevice : Object { public abstract bool incoming { get; } } -public abstract interface NotificationPopulator : Object { +public interface NotificationPopulator : Object { public abstract string id { get; } public abstract void init(Conversation conversation, NotificationCollection summary, WidgetType type); public abstract void close(Conversation conversation); diff --git a/libdino/src/service/history_sync.vala b/libdino/src/service/history_sync.vala index 514788a4..190284e0 100644 --- a/libdino/src/service/history_sync.vala +++ b/libdino/src/service/history_sync.vala @@ -23,7 +23,7 @@ public class Dino.HistorySync { private HashMap<string, Gee.List<Xmpp.MessageStanza>> stanzas = new HashMap<string, Gee.List<Xmpp.MessageStanza>>(); - public class HistorySync(Database db, StreamInteractor stream_interactor) { + public HistorySync(Database db, StreamInteractor stream_interactor) { this.stream_interactor = stream_interactor; this.db = db; diff --git a/libdino/src/service/roster_manager.vala b/libdino/src/service/roster_manager.vala index 6ddcda68..7cd844da 100644 --- a/libdino/src/service/roster_manager.vala +++ b/libdino/src/service/roster_manager.vala @@ -86,7 +86,7 @@ public class RosterStoreImpl : Roster.Storage, Object { private HashMap<Jid, Roster.Item> items = new HashMap<Jid, Roster.Item>(Jid.hash_bare_func, Jid.equals_bare_func); - public class RosterStoreImpl(Account account, Database db) { + public RosterStoreImpl(Account account, Database db) { this.account = account; this.db = db; diff --git a/plugins/omemo/src/protocol/bundle.vala b/plugins/omemo/src/protocol/bundle.vala index 48f7ed0e..b7e2b9cf 100644 --- a/plugins/omemo/src/protocol/bundle.vala +++ b/plugins/omemo/src/protocol/bundle.vala @@ -12,7 +12,7 @@ public class Bundle { assert(Plugin.ensure_context()); } - public int32 signed_pre_key_id { owned get { + public int32 signed_pre_key_id { get { if (node == null) return -1; string? id = ((!)node).get_deep_attribute("signedPreKeyPublic", "signedPreKeyId"); if (id == null) return -1; @@ -69,7 +69,7 @@ public class Bundle { this.node = node; } - public int32 key_id { owned get { + public int32 key_id { get { return int.parse(node.get_attribute("preKeyId") ?? "-1"); }} diff --git a/xmpp-vala/src/module/xep/0166_jingle/content.vala b/xmpp-vala/src/module/xep/0166_jingle/content.vala index 31d8f9fc..f6af1b17 100644 --- a/xmpp-vala/src/module/xep/0166_jingle/content.vala +++ b/xmpp-vala/src/module/xep/0166_jingle/content.vala @@ -254,7 +254,7 @@ public class Xmpp.Xep.Jingle.ContentEncryption : Object { public uint8[] our_key; public uint8[] peer_key; - public class ContentEncryption(string encryption_ns, string encryption_name, uint8[] our_key = new uint8[]{}, uint8[] peer_key = new uint8[]{}) { + public ContentEncryption(string encryption_ns, string encryption_name, uint8[] our_key = new uint8[]{}, uint8[] peer_key = new uint8[]{}) { this.encryption_ns = encryption_ns; this.encryption_name = encryption_name; this.our_key = our_key; |