devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Removed #AX_PREFIX_CONFIG_H

Browse Source
This commit is contained in:
James Booth
2016-03-31 21:05:02 +01:00
parent c91ce78a04
commit 9b177a9e01
50 changed files with 246 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xmpp/bookmark.c
View File

@@ -32,7 +32,7 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <assert.h>
#include <stdio.h>
@@ -40,10 +40,10 @@
#include <string.h>
#include <glib.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

14
src/xmpp/capabilities.c
View File

@@ -32,9 +32,9 @@
*
*/
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_GIT_VERSION
#ifdef HAVE_GIT_VERSION
#include "gitversion.h"
#endif
@@ -44,10 +44,10 @@
#include <glib.h>
#include <glib/gstdio.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
@@ -565,9 +565,9 @@ caps_create_query_response_stanza(xmpp_ctx_t *const ctx)
xmpp_stanza_set_attribute(identity, "type", "console");
GString *name_str = g_string_new("Profanity ");
g_string_append(name_str, PROF_PACKAGE_VERSION);
if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
#ifdef PROF_HAVE_GIT_VERSION
g_string_append(name_str, PACKAGE_VERSION);
if (strcmp(PACKAGE_STATUS, "development") == 0) {
#ifdef HAVE_GIT_VERSION
g_string_append(name_str, "dev.");
g_string_append(name_str, PROF_GIT_BRANCH);
g_string_append(name_str, ".");

6
src/xmpp/capabilities.h
View File

@@ -35,12 +35,12 @@
#ifndef XMPP_CAPABILITIES_H
#define XMPP_CAPABILITIES_H
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

12
src/xmpp/connection.c
View File

@@ -32,16 +32,16 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <assert.h>
#include <string.h>
#include <stdlib.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
@@ -425,7 +425,7 @@ _connection_free_session_data(void)
presence_clear_sub_requests();
}
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
static int
_connection_certfail_cb(xmpp_tlscert_t *xmpptlscert, const char *const errormsg)
{
@@ -544,7 +544,7 @@ _jabber_connect(const char *const fulljid, const char *const passwd, const char
xmpp_conn_set_flags(jabber_conn.conn, XMPP_CONN_FLAG_DISABLE_TLS);
}
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
char *cert_path = prefs_get_string(PREF_TLS_CERTPATH);
if (cert_path) {
xmpp_conn_tlscert_path(jabber_conn.conn, cert_path);
@@ -552,7 +552,7 @@ _jabber_connect(const char *const fulljid, const char *const passwd, const char
prefs_free_string(cert_path);
#endif
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
int connect_status = xmpp_connect_client(
jabber_conn.conn,
altdomain,

6
src/xmpp/connection.h
View File

@@ -35,12 +35,12 @@
#ifndef XMPP_CONNECTION_H
#define XMPP_CONNECTION_H
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

6
src/xmpp/form.c
View File

@@ -32,15 +32,15 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <string.h>
#include <stdlib.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

7
src/xmpp/form.h
View File

@@ -37,6 +37,13 @@
#include "xmpp/xmpp.h"
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
DataForm* form_create(xmpp_stanza_t *const stanza);
xmpp_stanza_t* form_create_submission(DataForm *form);

14
src/xmpp/iq.c
View File

@@ -32,9 +32,9 @@
*
*/
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_GIT_VERSION
#ifdef HAVE_GIT_VERSION
#include "gitversion.h"
#endif
@@ -43,10 +43,10 @@
#include <stdio.h>
#include <glib.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
@@ -1131,9 +1131,9 @@ _version_get_handler(xmpp_stanza_t *const stanza)
xmpp_stanza_t *version = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(version, "version");
xmpp_stanza_t *version_txt = xmpp_stanza_new(ctx);
GString *version_str = g_string_new(PROF_PACKAGE_VERSION);
if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
#ifdef PROF_HAVE_GIT_VERSION
GString *version_str = g_string_new(PACKAGE_VERSION);
if (strcmp(PACKAGE_STATUS, "development") == 0) {
#ifdef HAVE_GIT_VERSION
g_string_append(version_str, "dev.");
g_string_append(version_str, PROF_GIT_BRANCH);
g_string_append(version_str, ".");

8
src/xmpp/message.c
View File

@@ -32,15 +32,15 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <stdlib.h>
#include <string.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
@@ -198,7 +198,7 @@ message_send_chat_pgp(const char *const barejid, const char *const msg)
char *id = create_unique_id("msg");
xmpp_stanza_t *message = NULL;
#ifdef PROF_HAVE_LIBGPGME
#ifdef HAVE_LIBGPGME
char *account_name = jabber_get_account_name();
ProfAccount *account = accounts_get_account(account_name);
if (account->pgp_keyid) {

6
src/xmpp/presence.c
View File

@@ -32,7 +32,7 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <assert.h>
#include <stdlib.h>
@@ -41,10 +41,10 @@
#include <glib.h>
#include <glib/gprintf.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

6
src/xmpp/roster.c
View File

@@ -32,7 +32,7 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <assert.h>
#include <stdlib.h>
@@ -40,10 +40,10 @@
#include <glib.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

6
src/xmpp/stanza.c
View File

@@ -32,17 +32,17 @@
*
*/
#include "prof_config.h"
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

6
src/xmpp/stanza.h
View File

@@ -35,12 +35,12 @@
#ifndef XMPP_STANZA_H
#define XMPP_STANZA_H
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif

8
src/xmpp/xmpp.h
View File

@@ -35,12 +35,12 @@
#ifndef XMPP_XMPP_H
#define XMPP_XMPP_H
#include "prof_config.h"
#include "config.h"
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
#include <mesode.h>
#endif
#ifdef PROF_HAVE_LIBSTROPHE
#ifdef HAVE_LIBSTROPHE
#include <strophe.h>
#endif
@@ -155,7 +155,7 @@ char* jabber_get_account_name(void);
GList* jabber_get_available_resources(void);
char* jabber_create_uuid(void);
void jabber_free_uuid(char *uuid);
#ifdef PROF_HAVE_LIBMESODE
#ifdef HAVE_LIBMESODE
TLSCertificate* jabber_get_tls_peer_cert(void);
#endif
gboolean jabber_conn_is_secured(void);