Code cleanup around glib version check (2.28 minimum).

[claws.git] / src / common / utils.h

diff --git a/src/common/utils.h b/src/common/utils.h
index 2279b86664701705391259fd1e7815bc51bfc1f3..a1f356eed7bf1842b57a14bf63b7454bec73a3db 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -18,7 +18,6 @@
  * The code of the g_utf8_substring function below is owned by
  * Matthias Clasen <matthiasc@src.gnome.org>/<mclasen@redhat.com>
  * and is got from GLIB 2.30
- *
  */
 
 #ifndef __UTILS_H__
@@ -75,19 +74,6 @@ typedef gint64 goffset;
   #define HAVE_U32_TYPEDEF
 #endif
 
-#if !GLIB_CHECK_VERSION(2, 26, 0)
-#define g_base64_decode(t,l)   g_base64_decode_wa((t),(l))
-guchar *g_base64_decode_wa(const gchar *text, gsize *out_len);
-#endif
-
-#if !GLIB_CHECK_VERSION(2, 25, 0)
-# ifdef G_OS_WIN32
-       typedef _g_stat_struct GStatBuf;
-# else
-       typedef struct stat GStatBuf;
-# endif
-#endif
-
 #ifndef BIG_ENDIAN_HOST
   #if (G_BYTE_ORDER == G_BIG_ENDIAN)
     #define BIG_ENDIAN_HOST 1
@@ -141,7 +127,7 @@ guchar *g_base64_decode_wa(const gchar *text, gsize *out_len);
                g_warning("can't allocate memory"); \
                iffail; \
        } else { \
-               strncpy(__tmp, str, len); \
+               memcpy(__tmp, str, len); \
                __tmp[len] = '\0'; \
        } \
  \
@@ -279,8 +265,7 @@ GSList *slist_copy_deep             (GSList         *list,
 
 /* String utilities.  */
 
-void list_free_strings         (GList          *list);
-void slist_free_strings                (GSList         *list);
+void list_free_strings_full            (GList          *list);
 void slist_free_strings_full   (GSList         *list);
 
 void hash_free_strings         (GHashTable     *table);
@@ -432,8 +417,6 @@ const gchar *w32_get_cert_file              (void);
 #endif
 /* file / directory handling */
 off_t get_file_size            (const gchar    *file);
-off_t get_file_size_as_crlf    (const gchar    *file);
-
 time_t get_file_mtime          (const gchar *file);
 
 gboolean file_exist            (const gchar    *file,
@@ -520,6 +503,8 @@ time_t tzoffset_sec         (time_t         *now);
 gchar *tzoffset                        (time_t         *now);
 void get_rfc822_date           (gchar          *buf,
                                 gint            len);
+void get_rfc822_date_hide_tz   (gchar          *buf,
+                                gint            len);
 
 size_t fast_strftime           (gchar                  *buf, 
                                 gint                    buflen, 
@@ -544,7 +529,6 @@ const gchar * line_has_quote_char   (const gchar *str,
 
 gint g_int_compare     (gconstpointer a, gconstpointer b);
 
-gchar *generate_msgid          (gchar *buf, gint len, gchar *user_addr);
 gchar *generate_mime_boundary  (const gchar *prefix);
 
 gint quote_cmd_argument(gchar * result, guint size,