Set jid handle in ContactDetails, use LabelHybrids more, remove edit from StartConversation

3 files changed, 3 insertions, 16 deletions

diff --git a/main/src/ui/add_conversation/chat/dialog.vala b/main/src/ui/add_conversation/chat/dialog.vala
index ee535f09..4b618bc5 100644
--- a/main/src/ui/add_conversation/chat/dialog.vala
+++ b/main/src/ui/add_conversation/chat/dialog.vala
@@ -60,9 +60,6 @@ public class Dialog : Gtk.Dialog {
             add_contact_dialog.set_transient_for(this);
             add_contact_dialog.present();
         });
-        select_jid_fragment.edit_jid.connect(() => {
-
-        });
         select_jid_fragment.remove_jid.connect((row) => {
             ListRow list_row = roster_list.get_selected_row() as ListRow;
             stream_interactor.get_module(RosterManager.IDENTITY).remove_jid(list_row.account, list_row.jid);
@@ -74,4 +71,4 @@ public class Dialog : Gtk.Dialog {
     }
 }
 
-}
\ No newline at end of file
+}
diff --git a/main/src/ui/add_conversation/conference/dialog.vala b/main/src/ui/add_conversation/conference/dialog.vala
index 9674cef2..10d6e535 100644
--- a/main/src/ui/add_conversation/conference/dialog.vala
+++ b/main/src/ui/add_conversation/conference/dialog.vala
@@ -94,12 +94,6 @@ public class Dialog : Gtk.Dialog {
             dialog.set_transient_for(this);
             dialog.present();
         });
-        select_fragment.edit_jid.connect((row) => {
-            ConferenceListRow conference_row = row as ConferenceListRow;
-            AddGroupchatDialog dialog = new AddGroupchatDialog.for_conference(stream_interactor, conference_row.account, conference_row.bookmark);
-            dialog.set_transient_for(this);
-            dialog.present();
-        });
         select_fragment.remove_jid.connect((row) => {
             ConferenceListRow conference_row = row as ConferenceListRow;
             stream_interactor.get_module(MucManager.IDENTITY).remove_bookmark(conference_row.account, conference_row.bookmark);
@@ -165,4 +159,4 @@ public class Dialog : Gtk.Dialog {
     }
 }
 
-}
\ No newline at end of file
+}
diff --git a/main/src/ui/add_conversation/select_jid_fragment.vala b/main/src/ui/add_conversation/select_jid_fragment.vala
index 71314235..9e0c4067 100644
--- a/main/src/ui/add_conversation/select_jid_fragment.vala
+++ b/main/src/ui/add_conversation/select_jid_fragment.vala
@@ -9,7 +9,6 @@ namespace Dino.Ui.AddConversation {
 public class SelectJidFragment : Gtk.Box {
 
     public signal void add_jid();
-    public signal void edit_jid(ListRow row);
     public signal void remove_jid(ListRow row);
     public bool done {
         get {
@@ -20,7 +19,6 @@ public class SelectJidFragment : Gtk.Box {
     [GtkChild] private Entry entry;
     [GtkChild] private Box box;
     [GtkChild] private Button add_button;
-    [GtkChild] private Button edit_button;
     [GtkChild] private Button remove_button;
 
     private StreamInteractor stream_interactor;
@@ -45,7 +43,6 @@ public class SelectJidFragment : Gtk.Box {
         entry.changed.connect(on_entry_changed);
         add_button.clicked.connect(() => { add_jid(); });
         remove_button.clicked.connect(() => { remove_jid(filterable_list.get_selected_row() as ListRow); });
-        edit_button.clicked.connect(() => { edit_jid(filterable_list.get_selected_row() as ListRow); });
     }
 
     private void on_entry_changed() {
@@ -71,7 +68,6 @@ public class SelectJidFragment : Gtk.Box {
     private void check_buttons_active() {
         ListBoxRow? row = filterable_list.get_selected_row();
         bool active = row != null && !row.get_type().is_a(typeof(AddListRow));
-        edit_button.sensitive = active;
         remove_button.sensitive = active;
     }
 
@@ -115,4 +111,4 @@ public abstract class FilterableList : Gtk.ListBox {
     public abstract int sort(ListBoxRow row1, ListBoxRow row2);
 }
 
-}
\ No newline at end of file
+}