aboutsummaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorfiaxh <git@mx.ax.lt>2017-06-13 16:04:26 +0200
committerfiaxh <git@mx.ax.lt>2017-06-13 19:51:24 +0200
commitdabc2a8b1d2a7bf2019e5f913c736d80f11ceb53 (patch)
treec767da379fa8b3da9c17446bfb64bbd945fb9305 /main/src
parente63d59eb3450471b33a22efda6df8871818209b1 (diff)
downloaddino-dabc2a8b1d2a7bf2019e5f913c736d80f11ceb53.tar.gz
dino-dabc2a8b1d2a7bf2019e5f913c736d80f11ceb53.zip
MUC join behaviour + small MUC error changes
Diffstat (limited to 'main/src')
-rw-r--r--main/src/ui/add_conversation/accounts_combo_box.vala2
-rw-r--r--main/src/ui/add_conversation/conference/add_groupchat_dialog.vala3
2 files changed, 3 insertions, 2 deletions
diff --git a/main/src/ui/add_conversation/accounts_combo_box.vala b/main/src/ui/add_conversation/accounts_combo_box.vala
index b1c929bd..5fdd18e6 100644
--- a/main/src/ui/add_conversation/accounts_combo_box.vala
+++ b/main/src/ui/add_conversation/accounts_combo_box.vala
@@ -54,4 +54,4 @@ class AccountComboBox : ComboBox {
}
}
-} \ No newline at end of file
+}
diff --git a/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala b/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala
index 821360a9..602fe63f 100644
--- a/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala
+++ b/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala
@@ -43,6 +43,7 @@ protected class AddGroupchatDialog : Gtk.Dialog {
ok_button.sensitive = true;
accounts_stack.set_visible_child_name("label");
account_label.label = account.bare_jid.to_string();
+ account_combobox.selected = account;
jid_entry.text = conference.jid;
nick_entry.text = conference.nick ?? "";
autojoin_checkbutton.active = conference.autojoin;
@@ -78,4 +79,4 @@ protected class AddGroupchatDialog : Gtk.Dialog {
}
}
-} \ No newline at end of file
+}