[Commits] [SCM] claws branch, master, updated. 4.1.0-46-g7c3fb6c33

[paul at claws-mail.org]

The branch, master has been updated
       via  7c3fb6c33bd97c21668222c9dae10ef9b956888c (commit)
      from  a48eb8d8a7c6666cfc4896f570c0d1c428d60c52 (commit)

Summary of changes:
 src/common/socket.c                            | 5 ++---
 src/etpan/imap-thread.c                        | 2 ++
 src/etpan/nntp-thread.c                        | 5 +++--
 src/plugins/libravatar/libravatar_federation.c | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 7c3fb6c33bd97c21668222c9dae10ef9b956888c
Author: Paul <paul at claws-mail.org>
Date:   Sat Jul 23 13:42:02 2022 +0100

    fix some warnings when building with --disable-gnutls

diff --git a/src/common/socket.c b/src/common/socket.c
index 3fd79d354..6e8bb745b 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -129,14 +129,13 @@ static guint io_timeout = 60;
 
 static GList *sock_connect_data_list = NULL;
 
+#ifdef USE_GNUTLS
 static gboolean ssl_sock_prepare	(GSource	*source,
 					 gint		*timeout);
 static gboolean ssl_sock_check		(GSource	*source);
 static gboolean ssl_sock_dispatch	(GSource	*source,
 					 GSourceFunc	 callback,
 					 gpointer	 user_data);
-
-#ifdef USE_GNUTLS
 GSourceFuncs ssl_watch_funcs = {
 	ssl_sock_prepare,
 	ssl_sock_check,
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 78a4dbce6..a043f2c78 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -97,6 +97,7 @@ static int do_mailimap_socket_connect(mailimap * imap, const char * server,
 	return mailimap_connect(imap, stream);
 }
 
+#ifdef USE_GNUTLS
 static int do_mailimap_ssl_connect_with_callback(mailimap * imap, const char * server,
 	gushort port,
 	void (* callback)(struct mailstream_ssl_context * ssl_context, void * data),
@@ -142,6 +143,7 @@ static int do_mailimap_ssl_connect_with_callback(mailimap * imap, const char * s
 
 	return mailimap_connect(imap, stream);
 }
+#endif
 
 static gboolean thread_manager_event(GIOChannel * source,
     GIOCondition condition,
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
index 65e794aa6..76020ca66 100644
--- a/src/etpan/nntp-thread.c
+++ b/src/etpan/nntp-thread.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team
+ * Copyright (C) 2005-2022 the Claws Mail team and DINH Viet Hoa
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -97,6 +97,7 @@ static int do_newsnntp_socket_connect(newsnntp * imap, const char * server,
 	return newsnntp_connect(imap, stream);
 }
 
+#ifdef USE_GNUTLS
 static int do_newsnntp_ssl_connect_with_callback(newsnntp * imap, const char * server,
 	gushort port,
 	void (* callback)(struct mailstream_ssl_context * ssl_context, void * data),
@@ -137,7 +138,7 @@ static int do_newsnntp_ssl_connect_with_callback(newsnntp * imap, const char * s
 
 	return newsnntp_connect(imap, stream);
 }
-
+#endif
 
 static void nntp_logger(int direction, const char * str, size_t size) 
 {
diff --git a/src/plugins/libravatar/libravatar_federation.c b/src/plugins/libravatar/libravatar_federation.c
index 859417f94..09824e23b 100644
--- a/src/plugins/libravatar/libravatar_federation.c
+++ b/src/plugins/libravatar/libravatar_federation.c
@@ -26,6 +26,7 @@
 
 #define MISSING "x"
 
+#if defined USE_GNUTLS
 static GHashTable *federated = NULL;
 
 /**
@@ -70,6 +71,7 @@ static void add_federated_url_for_domain(const gchar *url, const gchar *domain)
 	debug_print("new cached avatar url for domain %s: %s\n", domain, url);
 	g_hash_table_insert(federated, g_strdup(domain), g_strdup(url)); 
 }
+#endif
 
 /**
  * Retrieves the federated URL for a given email address.

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail