[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-56-gbe0d007f5
wwp at claws-mail.org
wwp at claws-mail.org
Sat Feb 17 12:33:47 UTC 2024
The branch, gtk2 has been updated
via be0d007f5e941faa6f5d7e9d3b829104d19ef461 (commit)
from 17b759e1409c8e7c0fe90271828e779d855e761e (commit)
Summary of changes:
configure.ac | 13 -------------
src/addressbook.c | 5 ++---
src/addrharvest.c | 4 +---
src/common/utils.c | 17 ++---------------
src/common/utils.h | 6 ++----
src/exporthtml.c | 2 --
src/exportldif.c | 2 --
src/gtk/gtkaspell.c | 1 -
src/imap.c | 3 +--
src/mh.c | 6 ++----
src/news.c | 6 ++----
src/plugins/mailmbox/mailmbox_folder.c | 9 +++------
src/plugins/vcalendar/vcal_folder.c | 3 +--
src/prefs_template.c | 3 +--
src/ssl_manager.c | 5 ++---
src/stock_pixmap.c | 3 +--
src/toolbar.c | 5 ++---
src/uri_opener.c | 5 ++---
18 files changed, 24 insertions(+), 74 deletions(-)
- Log -----------------------------------------------------------------
commit be0d007f5e941faa6f5d7e9d3b829104d19ef461
Author: Ricardo Mones <ricardo at mones.org>
Date: Fri Feb 16 17:24:41 2024 +0100
Remove remaining references to dirent
which has become unused now.
diff --git a/configure.ac b/configure.ac
index 7d2784178..09a94d6fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,20 +420,7 @@ if test "$ac_cv_va_opt" = yes; then
AC_DEFINE([HAVE_VA_OPT], [1], [Define if __VA_OPT__ macro works])
fi
-dnl Check for d_type member in struct dirent
-AC_MSG_CHECKING([whether struct dirent has d_type member])
-AC_CACHE_VAL(ac_cv_dirent_d_type,[
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dirent.h>]], [[struct dirent d; d.d_type = DT_REG;]])],[ac_cv_dirent_d_type=yes],[ac_cv_dirent_d_type=no])
-])
-AC_MSG_RESULT($ac_cv_dirent_d_type)
-if test $ac_cv_dirent_d_type = yes; then
- AC_DEFINE(HAVE_DIRENT_D_TYPE, 1,
- Define if `struct dirent' has `d_type' member.)
-fi
-
dnl Checks for header files.
-AC_HEADER_DIRENT
-
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
sys/param.h sys/utsname.h sys/select.h \
diff --git a/src/addressbook.c b/src/addressbook.c
index 82536d96e..2db1f8414 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1,6 +1,6 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 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
@@ -30,7 +30,6 @@
#include <string.h>
#include <setjmp.h>
#include <sys/types.h>
-#include <dirent.h>
#include "main.h"
#include "addressbook.h"
diff --git a/src/addrharvest.c b/src/addrharvest.c
index b14ac5290..020e9c467 100644
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2022 Match Grun and the Claws Mail team
+ * Copyright (C) 2002-2024 Match Grun 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
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -27,7 +26,6 @@
#endif
#include <sys/stat.h>
-#include <dirent.h>
#include <glib.h>
#include <string.h>
diff --git a/src/common/utils.c b/src/common/utils.c
index 076f156aa..8181d5f15 100644
--- a/src/common/utils.c
+++ b/src/common/utils.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
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 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
@@ -67,7 +67,6 @@
#if HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
-#include <dirent.h>
#include <time.h>
#include <regex.h>
@@ -2094,18 +2093,6 @@ gboolean is_file_entry_regular(const gchar *file)
return g_file_test(file, G_FILE_TEST_IS_REGULAR);
}
-gboolean dirent_is_regular_file(struct dirent *d)
-{
-#if !defined(G_OS_WIN32) && defined(HAVE_DIRENT_D_TYPE)
- if (d->d_type == DT_REG)
- return TRUE;
- else if (d->d_type != DT_UNKNOWN)
- return FALSE;
-#endif
-
- return g_file_test(d->d_name, G_FILE_TEST_IS_REGULAR);
-}
-
gint change_dir(const gchar *dir)
{
gchar *prevdir = NULL;
diff --git a/src/common/utils.h b/src/common/utils.h
index fb8eeefe8..3682e6118 100644
--- 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-2022 The Claws Mail Team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 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
@@ -38,7 +38,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
-#include <dirent.h>
#include <time.h>
#if HAVE_ALLOCA_H
# include <alloca.h>
@@ -427,7 +426,6 @@ gboolean is_relative_filename (const gchar *file);
gboolean is_dir_exist (const gchar *dir);
gboolean is_file_entry_exist (const gchar *file);
gboolean is_file_entry_regular(const gchar *file);
-gboolean dirent_is_regular_file (struct dirent *d);
#define is_file_exist(file) file_exist(file, FALSE)
#define is_file_or_fifo_exist(file) file_exist(file, TRUE)
diff --git a/src/exporthtml.c b/src/exporthtml.c
index b2ea89268..4fc48db4d 100644
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -31,7 +30,6 @@
#endif
#include <sys/stat.h>
-#include <dirent.h>
#include <errno.h>
#include <time.h>
#include <string.h>
diff --git a/src/exportldif.c b/src/exportldif.c
index 16006cf8b..c2cfab9e5 100644
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/*
@@ -26,7 +25,6 @@
#endif
#include <sys/stat.h>
-#include <dirent.h>
#include <errno.h>
#include <time.h>
#include <string.h>
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index f4dd41163..bc880673e 100644
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -45,7 +45,6 @@
#include <sys/time.h>
#include <fcntl.h>
#include <time.h>
-#include <dirent.h>
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/src/imap.c b/src/imap.c
index 90ac9d6d7..b95e36388 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2024 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
@@ -36,7 +36,6 @@
#ifdef HAVE_LIBETPAN
#include <stdlib.h>
-#include <dirent.h>
#include <unistd.h>
#include <ctype.h>
#include <time.h>
diff --git a/src/mh.c b/src/mh.c
index bb77cd664..613886052 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 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
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
@@ -26,7 +25,6 @@
#include <glib.h>
#include <glib/gi18n.h>
-#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/news.c b/src/news.c
index e45c18c38..63bed4ea8 100644
--- a/src/news.c
+++ b/src/news.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
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 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
@@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
@@ -31,7 +30,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <dirent.h>
#include <unistd.h>
#include <time.h>
#include <libetpan/libetpan.h>
diff --git a/src/plugins/mailmbox/mailmbox_folder.c b/src/plugins/mailmbox/mailmbox_folder.c
index 0bac1491d..179ec2486 100644
--- a/src/plugins/mailmbox/mailmbox_folder.c
+++ b/src/plugins/mailmbox/mailmbox_folder.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 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
@@ -13,11 +13,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#ifdef HAVE_CONFIG_H
# include "config.h"
# include "claws-features.h"
@@ -28,7 +26,6 @@
#include "defs.h"
-#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index 1bb8c1cef..177690531 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail team and Colin Leroy <colin at colino.net>
+ * Copyright (C) 1999-2024 the Claws Mail team and Colin Leroy <colin at colino.net>
*
* 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
@@ -66,7 +66,6 @@
#include "messageview.h"
#include <gtk/gtk.h>
-#include <dirent.h>
#ifdef USE_PTHREAD
#include <pthread.h>
diff --git a/src/prefs_template.c b/src/prefs_template.c
index fed2f4a0c..37f2b4799 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1,7 +1,7 @@
/*
* Claws Mail templates subsystem
* Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2020 The Claws Mail team
+ * Copyright (C) 2001-2024 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
@@ -26,7 +26,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
-#include <dirent.h>
#include <sys/stat.h>
#include "template.h"
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index b1e87c485..e31c8c0e7 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.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 Colin Leroy
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 the Claws Mail team and Colin Leroy
*
* 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
@@ -26,7 +26,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <sys/types.h>
-#include <dirent.h>
#include "ssl_manager.h"
#include "ssl_certificate.h"
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 98fe656b8..2717d55e9 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2024 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
@@ -24,7 +24,6 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <string.h>
-#include <dirent.h>
#ifdef HAVE_SVG
#include <librsvg/rsvg.h>
#include <math.h>
diff --git a/src/toolbar.c b/src/toolbar.c
index ce3e3736a..6311b51e3 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1,6 +1,6 @@
/*
- * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2017 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2024 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
@@ -27,7 +27,6 @@
#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
-#include <dirent.h>
#include <sys/stat.h>
#include <math.h>
#include <setjmp.h>
diff --git a/src/uri_opener.c b/src/uri_opener.c
index 7c423a937..04391c467 100644
--- a/src/uri_opener.c
+++ b/src/uri_opener.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 Colin Leroy
+ * Claws Mail -- a GTK based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2024 the Claws Mail team and Colin Leroy
*
* 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
@@ -26,7 +26,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <sys/types.h>
-#include <dirent.h>
#include "manage_window.h"
#include "utils.h"
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list