Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a couple of typos and one network typo #570

Merged
merged 2 commits into from
Jun 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libdino/src/service/file_manager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class FileManager : StreamInteractionModule, Object {
private StreamInteractor stream_interactor;
private Database db;
private Gee.List<FileSender> file_senders = new ArrayList<FileSender>();
public Gee.List<IncommingFileProcessor> incomming_processors = new ArrayList<IncommingFileProcessor>();
public Gee.List<IncomingFileProcessor> incoming_processors = new ArrayList<IncomingFileProcessor>();
private Gee.List<OutgoingFileProcessor> outgoing_processors = new ArrayList<OutgoingFileProcessor>();

public static void start(StreamInteractor stream_interactor, Database db) {
Expand Down Expand Up @@ -116,7 +116,7 @@ public class FileManager : StreamInteractionModule, Object {
}

public void add_provider(FileProvider file_provider) {
file_provider.file_incoming.connect((file_transfer, conversation) => { handle_incomming_file.begin(file_provider, file_transfer, conversation); });
file_provider.file_incoming.connect((file_transfer, conversation) => { handle_incoming_file.begin(file_provider, file_transfer, conversation); });
}

public void add_sender(FileSender file_sender) {
Expand All @@ -126,8 +126,8 @@ public class FileManager : StreamInteractionModule, Object {
});
}

public void add_incomming_processor(IncommingFileProcessor processor) {
incomming_processors.add(processor);
public void add_incoming_processor(IncomingFileProcessor processor) {
incoming_processors.add(processor);
}

public void add_outgoing_processor(OutgoingFileProcessor processor) {
Expand All @@ -140,7 +140,7 @@ public class FileManager : StreamInteractionModule, Object {
return file_transfer.direction == FileTransfer.DIRECTION_SENT || in_roster;
}

private async void handle_incomming_file(FileProvider file_provider, FileTransfer file_transfer, Conversation conversation) {
private async void handle_incoming_file(FileProvider file_provider, FileTransfer file_transfer, Conversation conversation) {
if (!is_sender_trustworthy(file_transfer, conversation)) return;

if (file_transfer.size == -1) {
Expand Down Expand Up @@ -192,7 +192,7 @@ public interface FileSender : Object {
public abstract void send_file(Conversation conversation, FileTransfer file_transfer);
}

public interface IncommingFileProcessor : Object {
public interface IncomingFileProcessor : Object {
public abstract bool can_process(FileTransfer file_transfer);
public abstract void process(FileTransfer file_transfer);
}
Expand Down
2 changes: 1 addition & 1 deletion libdino/src/service/stream_interactor.vala
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class ModuleIdentity<T> : Object {
}

public bool matches(StreamInteractionModule module) {
return module.id== id;
return module.id == id;
}
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/http-files/src/file_provider.vala
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class FileProvider : Dino.FileProvider, Object {

file_transfer.input_stream = yield request.send_async(null);

foreach (IncommingFileProcessor processor in stream_interactor.get_module(FileManager.IDENTITY).incomming_processors) {
foreach (IncomingFileProcessor processor in stream_interactor.get_module(FileManager.IDENTITY).incoming_processors) {
if (processor.can_process(file_transfer)) {
processor.process(file_transfer);
}
Expand Down
1 change: 0 additions & 1 deletion plugins/omemo/src/stream_module.vala
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Gee;
using Xmpp;
using Xmpp;
using Xmpp.Xep;
using Signal;

Expand Down
2 changes: 1 addition & 1 deletion plugins/openpgp/src/in_file_processor.vala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ using Dino.Entities;

namespace Dino.Plugins.OpenPgp {

public class InFileProcessor : IncommingFileProcessor, Object {
public class InFileProcessor : IncomingFileProcessor, Object {
public bool can_process(FileTransfer file_transfer) {
return file_transfer.file_name.has_suffix("pgp") || file_transfer.mime_type == "application/pgp-encrypted";
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/openpgp/src/plugin.vala
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Plugin : Plugins.RootInterface, Object {

Manager.start(app.stream_interactor, db);
app.stream_interactor.get_module(FileManager.IDENTITY).add_outgoing_processor(new OutFileProcessor(app.stream_interactor));
app.stream_interactor.get_module(FileManager.IDENTITY).add_incomming_processor(new InFileProcessor());
app.stream_interactor.get_module(FileManager.IDENTITY).add_incoming_processor(new InFileProcessor());

internationalize(GETTEXT_PACKAGE, app.search_path_generator.get_locale_path(GETTEXT_PACKAGE, LOCALE_INSTALL_DIR));
}
Expand Down
3 changes: 1 addition & 2 deletions plugins/openpgp/src/stream_flag.vala
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Gee;

using Xmpp;
using Xmpp;

namespace Dino.Plugins.OpenPgp {
Expand All @@ -19,4 +18,4 @@ public class Flag : XmppStreamFlag {
public override string get_id() { return IDENTITY.id; }
}

}
}
4 changes: 2 additions & 2 deletions xmpp-vala/src/module/iq/module.vala
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ namespace Xmpp.Iq {
}
}
} else {
Iq.Stanza unaviable_error = new Iq.Stanza.error(iq, new StanzaNode.build("service-unaviable", "urn:ietf:params:xml:ns:xmpp-stanzas").add_self_xmlns());
send_iq(stream, unaviable_error);
Iq.Stanza unavailable_error = new Iq.Stanza.error(iq, new StanzaNode.build("service-unavailable", "urn:ietf:params:xml:ns:xmpp-stanzas").add_self_xmlns());
send_iq(stream, unavailable_error);
}
}
}
Expand Down
1 change: 0 additions & 1 deletion xmpp-vala/src/module/xep/0363_http_file_upload.vala
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xmpp;
using Xmpp;
using Xmpp.Xep;

namespace Xmpp.Xep.HttpFileUpload {
Expand Down