Make all mucconfwin functions take ProfMucConfWin

2 files changed, 10 insertions, 7 deletions

diff --git a/src/ui/mucconfwin.c b/src/ui/mucconfwin.c
index 12850e1a..dd614306 100644
--- a/src/ui/mucconfwin.c
+++ b/src/ui/mucconfwin.c
@@ -75,21 +75,24 @@ mucconfwin_show_form(ProfMucConfWin *confwin)
 }
 
 void
-mucconfwin_show_form_field(ProfWin *window, DataForm *form, char *tag)
+mucconfwin_show_form_field(ProfMucConfWin *confwin, DataForm *form, char *tag)
 {
+    assert(confwin != NULL);
+
     FormField *field = form_get_field_by_tag(form, tag);
+    ProfWin *window = (ProfWin*)confwin;
     _mucconfwin_form_field(window, tag, field);
     win_println(window, 0, "");
 }
 
 void
-mucconfwin_handle_configuration(const char *const roomjid, DataForm *form)
+mucconfwin_handle_configuration(ProfMucConfWin *confwin, DataForm *form)
 {
-    ProfWin *window = wins_new_muc_config(roomjid, form);
-    ProfMucConfWin *confwin = (ProfMucConfWin*)window;
-    assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);
+    assert(confwin != NULL);
 
+    ProfWin *window = (ProfWin*)confwin;
     ui_focus_win(window);
+
     mucconfwin_show_form(confwin);
 
     win_print(window, '-', 0, NULL, 0, 0, "", "");
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 2deb9514..c3d65978 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -108,12 +108,12 @@ void ui_handle_recipient_error(const char *const recipient, const char *const er
 void ui_handle_error(const char *const err_msg);
 void ui_clear_win_title(void);
 void ui_goodbye_title(void);
-void mucconfwin_handle_configuration(const char *const roomjid, DataForm *form);
+void mucconfwin_handle_configuration(ProfMucConfWin *confwin, DataForm *form);
 void ui_handle_room_configuration_form_error(const char *const roomjid, const char *const message);
 void ui_handle_room_config_submit_result(const char *const roomjid);
 void ui_handle_room_config_submit_result_error(const char *const roomjid, const char *const message);
 void mucconfwin_show_form(ProfMucConfWin *confwin);
-void mucconfwin_show_form_field(ProfWin *window, DataForm *form, char *tag);
+void mucconfwin_show_form_field(ProfMucConfWin *confwin, DataForm *form, char *tag);
 void mucconfwin_form_help(ProfMucConfWin *confwin);
 void mucconfwin_field_help(ProfMucConfWin *confwin, char *tag);
 void ui_show_lines(ProfWin *window, const gchar** lines);