3 files changed, 4 insertions, 8 deletions
diff --git a/main/src/emojichooser.c b/main/src/emojichooser.c
index f8c0c51c..35d3bcff 100644
--- a/main/src/emojichooser.c
+++ b/main/src/emojichooser.c
@@ -813,8 +813,8 @@ dino_emoji_chooser_class_init (DinoEmojiChooserClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, search_changed);
 }
 
-GtkWidget *
+DinoEmojiChooser *
 dino_emoji_chooser_new (void)
 {
-  return GTK_WIDGET (g_object_new (GTK_TYPE_EMOJI_CHOOSER, NULL));
+  return DINO_EMOJI_CHOOSER (g_object_new (GTK_TYPE_EMOJI_CHOOSER, NULL));
 }
diff --git a/main/src/emojichooser.h b/main/src/emojichooser.h
index 3e459431..e7dc8660 100644
--- a/main/src/emojichooser.h
+++ b/main/src/emojichooser.h
@@ -31,6 +31,6 @@ typedef struct _DinoEmojiChooser      DinoEmojiChooser;
 typedef struct _DinoEmojiChooserClass DinoEmojiChooserClass;
 
 GType      dino_emoji_chooser_get_type (void) G_GNUC_CONST;
-GtkWidget *dino_emoji_chooser_new      (void);
+DinoEmojiChooser *dino_emoji_chooser_new      (void);
 
 G_END_DECLS
diff --git a/main/src/ui/occupant_menu/list.vala b/main/src/ui/occupant_menu/list.vala
index c422a899..ffa98f31 100644
--- a/main/src/ui/occupant_menu/list.vala
+++ b/main/src/ui/occupant_menu/list.vala
@@ -24,7 +24,7 @@ public class List : Box {
         list_box.set_header_func(header);
         list_box.set_sort_func(sort);
         list_box.set_filter_func(filter);
-        search_entry.search_changed.connect(search_changed);
+        search_entry.search_changed.connect(refilter);
 
         stream_interactor.get_module(PresenceManager.IDENTITY).show_received.connect(on_show_received);
         stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect(on_updated_roster_item);
@@ -52,10 +52,6 @@ public class List : Box {
         list_box.invalidate_filter();
     }
 
-    private void search_changed(Editable editable) {
-        refilter();
-    }
-
     public void add_occupant(Jid jid) {
         rows[jid] = new ListRow(stream_interactor, conversation, jid);
         list_box.add(rows[jid]);