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 c90487432f85fe57b198e8203ca8e25e60db5cf4..a1f356eed7bf1842b57a14bf63b7454bec73a3db 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -74,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
@@ -140,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'; \
        } \
  \
@@ -278,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);