aboutsummaryrefslogtreecommitdiff
path: root/main/src/ui/add_conversation/add_conference_dialog.vala
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-11-17 17:53:46 +0100
committerfiaxh <git@lightrise.org>2019-11-17 17:53:46 +0100
commit05561dd677b4098d1a618bcc3e01fc77c5ce19de (patch)
treef25ea04f3e7ef40211c161af366244efc2c206a5 /main/src/ui/add_conversation/add_conference_dialog.vala
parenta2f63a7789aca9e05e5dfd1a9c2838e31aefe60d (diff)
downloaddino-05561dd677b4098d1a618bcc3e01fc77c5ce19de.tar.gz
dino-05561dd677b4098d1a618bcc3e01fc77c5ce19de.zip
Parse presence delivery errors when joining MUC
fixes #224
Diffstat (limited to 'main/src/ui/add_conversation/add_conference_dialog.vala')
-rw-r--r--main/src/ui/add_conversation/add_conference_dialog.vala8
1 files changed, 1 insertions, 7 deletions
diff --git a/main/src/ui/add_conversation/add_conference_dialog.vala b/main/src/ui/add_conversation/add_conference_dialog.vala
index 12a7b57a..9639eed3 100644
--- a/main/src/ui/add_conversation/add_conference_dialog.vala
+++ b/main/src/ui/add_conversation/add_conference_dialog.vala
@@ -3,6 +3,7 @@ using Gtk;
using Dino.Entities;
using Xmpp;
+using Xmpp.Xep;
namespace Dino.Ui {
@@ -49,7 +50,6 @@ public class AddConferenceDialog : Gtk.Dialog {
cancel_button.clicked.connect(on_cancel);
ok_button.label = _("Next");
ok_button.sensitive = select_fragment.done;
- ok_button.clicked.disconnect(on_ok_button_clicked);
ok_button.clicked.connect(on_next_button_clicked);
details_fragment.notify["done"].disconnect(set_ok_sensitive_from_details);
select_fragment.notify["done"].connect(set_ok_sensitive_from_select);
@@ -69,7 +69,6 @@ public class AddConferenceDialog : Gtk.Dialog {
ok_button.label = _("Join");
ok_button.sensitive = details_fragment.done;
ok_button.clicked.disconnect(on_next_button_clicked);
- ok_button.clicked.connect(on_ok_button_clicked);
select_fragment.notify["done"].disconnect(set_ok_sensitive_from_select);
details_fragment.notify["done"].connect(set_ok_sensitive_from_details);
}
@@ -143,7 +142,6 @@ public class AddConferenceDialog : Gtk.Dialog {
Button ok_button = new Button() { label=_("Join"), halign = Align.END, can_focus=true, can_default=true, visible=true };
ok_button.get_style_context().add_class("suggested-action");
- ok_button.clicked.connect(on_ok_button_clicked);
details_fragment.notify["done"].connect(() => { ok_button.sensitive = select_fragment.done; });
details_fragment.ok_button = ok_button;
@@ -182,10 +180,6 @@ public class AddConferenceDialog : Gtk.Dialog {
show_conference_details_view();
}
- private void on_ok_button_clicked() {
- stream_interactor.get_module(MucManager.IDENTITY).join(details_fragment.account, new Jid(details_fragment.jid), details_fragment.nick, details_fragment.password);
- }
-
private void on_joined(Account account, Jid jid, string nick) {
if (account.equals(details_fragment.account) && jid.equals_bare(new Jid(details_fragment.jid))) {
Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(jid, account, Conversation.Type.GROUPCHAT);