Fix OSX compile

3 files changed, 45 insertions, 1 deletions

diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index 80ede2dc..1a6c0132 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -50,6 +50,7 @@
 #include "ui/ui.h"
 #include "window_list.h"
 #include "config/preferences.h"
+#include "xmpp/xmpp.h"
 
 static GTimer *remind_timer;
 
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 01ae3953..36a70618 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -40,6 +40,7 @@
 #include "command/commands.h"
 #include "ui/win_types.h"
 #include "muc.h"
+#include "config/tlscerts.h"
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
diff --git a/src/ui/win_types.h b/src/ui/win_types.h
index e241a852..f05f237e 100644
--- a/src/ui/win_types.h
+++ b/src/ui/win_types.h
@@ -45,9 +45,9 @@
 #include <ncurses.h>
 #endif
 
-#include "xmpp/xmpp.h"
 #include "ui/buffer.h"
 #include "chat_state.h"
+#include "tools/autocomplete.h"
 
 #define LAYOUT_SPLIT_MEMCHECK       12345671
 #define PROFCHATWIN_MEMCHECK        22374522
@@ -58,6 +58,48 @@
 #define PROFPLUGINWIN_MEMCHECK      43434777
 
 typedef enum {
+    FIELD_HIDDEN,
+    FIELD_TEXT_SINGLE,
+    FIELD_TEXT_PRIVATE,
+    FIELD_TEXT_MULTI,
+    FIELD_BOOLEAN,
+    FIELD_LIST_SINGLE,
+    FIELD_LIST_MULTI,
+    FIELD_JID_SINGLE,
+    FIELD_JID_MULTI,
+    FIELD_FIXED,
+    FIELD_UNKNOWN
+} form_field_type_t;
+
+typedef struct form_option_t {
+    char *label;
+    char *value;
+} FormOption;
+
+typedef struct form_field_t {
+    char *label;
+    char *type;
+    form_field_type_t type_t;
+    char *var;
+    char *description;
+    gboolean required;
+    GSList *values;
+    GSList *options;
+    Autocomplete value_ac;
+} FormField;
+
+typedef struct data_form_t {
+    char *type;
+    char *title;
+    char *instructions;
+    GSList *fields;
+    GHashTable *var_to_tag;
+    GHashTable *tag_to_var;
+    Autocomplete tag_ac;
+    gboolean modified;
+} DataForm;
+
+typedef enum {
     LAYOUT_SIMPLE,
     LAYOUT_SPLIT
 } layout_type_t;