1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-16 21:35:24 +00:00

Fix OSX compile

This commit is contained in:
James Booth 2016-04-26 21:34:06 +01:00 committed by Dominik Heidler
parent 65960dfbb2
commit 4ca6296fb7
7 changed files with 49 additions and 46 deletions

View File

@ -288,6 +288,8 @@ AC_CHECK_HEADERS([ncurses.h], [], [])
AM_CFLAGS="-Wall -Wno-deprecated-declarations"
AS_IF([test "x$PACKAGE_STATUS" = xdevelopment],
[AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"])
AS_IF([test "x$PLATFORM" = xosx],
[AM_CFLAGS="$AM_CFLAGS -Qunused-arguments"])
AM_LDFLAGS="$AM_LDFLAGS -export-dynamic"
AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS $PYTHON_CPPFLAGS ${GTK_CFLAGS}"
AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\" -DICONS_PATH=\"\\\"$ICONS_PATH\\\"\""

View File

@ -45,6 +45,7 @@
#include "window_list.h"
#include "contact.h"
#include "ui/ui.h"
#include "xmpp/xmpp.h"
#include "config/preferences.h"
#include "chat_session.h"

View File

@ -41,9 +41,7 @@
#include <sys/select.h>
#include <curl/curl.h>
// forward -> ui/win_types.h
typedef struct prof_win_t ProfWin;
#include "ui/win_types.h"
typedef struct http_upload_t {
char *filename;

View File

@ -50,6 +50,7 @@
#include "ui/ui.h"
#include "window_list.h"
#include "config/preferences.h"
#include "xmpp/xmpp.h"
static GTimer *remind_timer;

View File

@ -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

View File

@ -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
@ -57,6 +57,48 @@
#define PROFXMLWIN_MEMCHECK 87333463
#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

View File

@ -101,48 +101,6 @@ typedef struct disco_info_t {
GHashTable *features;
} DiscoInfo;
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;
// connection functions
void jabber_init(void);
jabber_conn_status_t jabber_connect_with_details(const char *const jid, const char *const passwd,